@modern-js/server-core 2.58.3 → 2.59.0

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var customServer_exports = {};
 __export(customServer_exports, {
@@ -175,7 +165,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/cjs/plugins/render/inject.js

@@ -31,16 +31,25 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig }) => ({
         var _config_render;
         const { distDirectory: pwd, routes, metaName } = api.useAppContext();
         const config = api.useConfigContext();
+        const hookRunner = api.useHookRunners();
         if (!routes) {
           return;
         }
+        const onFallback = async (reason, utils, error) => {
+          await hookRunner.fallback({
+            reason,
+            ...utils,
+            error
+          });
+        };
         const getRenderHandlerOptions = {
           pwd,
           routes,
           config,
           metaName,
           cacheConfig: ((_config_render = config.render) === null || _config_render === void 0 ? void 0 : _config_render.cache) || cacheConfig,
-          staticGenerate
+          staticGenerate,
+          onFallback
         };
         const render = await getRenderHandler(getRenderHandlerOptions);
         api.setAppContext({
@@ -52,7 +61,7 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig }) => ({
     };
   }
 });
-async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate }) {
+async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback }) {
   var _config_server, _config_security;
   const ssrConfig = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr;
   const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
@@ -64,7 +73,8 @@ async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, st
     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 render;
 }

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

@@ -31,11 +31,10 @@ __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_constants = require("../../constants");
-var import_utils2 = require("../../utils");
+var import_utils = require("../../utils");
 var import_dataHandler = require("./dataHandler");
 var import_ssrRender = require("./ssrRender");
 const DYNAMIC_ROUTE_REG = /\/:./;
@@ -50,8 +49,8 @@ function getRouter(routes) {
     }
   });
   const finalRoutes = [
-    ...normalRoutes.sort(import_utils2.sortRoutes),
-    ...dynamicRoutes.sort(import_utils2.sortRoutes)
+    ...normalRoutes.sort(import_utils.sortRoutes),
+    ...dynamicRoutes.sort(import_utils.sortRoutes)
   ];
   const router = new import_trie_router.TrieRouter();
   for (const route of finalRoutes) {
@@ -77,9 +76,13 @@ 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, matchPathname, loaderContext }) => {
-    const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : (0, import_utils2.getPathname)(req);
+    const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : (0, import_utils.getPathname)(req);
     const [routeInfo, params] = matchRoute(router, forMatchpathname);
+    const framework = metaName || "modern-js";
+    const fallbackHeader = `x-${(0, import_universal.cutNameByHyphen)(framework)}-ssr-fallback`;
+    let fallbackReason = null;
     const onFallback = async (reason, error) => {
+      fallbackReason = reason;
       return onFallbackFn === null || onFallbackFn === void 0 ? void 0 : onFallbackFn(reason, {
         logger,
         reporter,
@@ -87,7 +90,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       }, error);
     };
     if (!routeInfo) {
-      return new Response((0, import_utils2.createErrorHtml)(404), {
+      return new Response((0, import_utils.createErrorHtml)(404), {
         status: 404,
         headers: {
           "content-type": "text/html; charset=UTF-8"
@@ -96,16 +99,15 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
     }
     const html = templates[routeInfo.entryName];
     if (!html) {
-      return new Response((0, import_utils2.createErrorHtml)(404), {
+      return new Response((0, import_utils.createErrorHtml)(404), {
         status: 404,
         headers: {
           "content-type": "text/html; charset=UTF-8"
         }
       });
     }
-    const renderMode = await getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR, nodeReq, onFallback);
-    const pathname = (0, import_utils2.getPathname)(req);
-    const headerData = (0, import_utils2.parseHeaders)(req);
+    const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, forceCSR, nodeReq, onFallback);
+    const headerData = (0, import_utils.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, forMatchpathname, getHeadersWithoutCookie(headerData));
     };
@@ -113,7 +115,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       monitors === null || monitors === void 0 ? void 0 : monitors.timing(name, dur, "SSR");
     };
     const onBoundError = async (e) => {
-      (0, import_utils2.onError)(import_utils2.ErrorDigest.ERENDER, e, monitors, req);
+      (0, import_utils.onError)(import_utils.ErrorDigest.ERENDER, e, monitors, req);
       await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e));
     };
     const renderOptions = {
@@ -147,6 +149,9 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       default:
         throw new Error(`Unknown render mode: ${renderMode}`);
     }
+    if (fallbackReason) {
+      response.headers.set(fallbackHeader, `1;reason=${fallbackReason}`);
+    }
     return response;
   };
 }
@@ -161,11 +166,14 @@ async function renderHandler(request, options, mode, onError) {
   let response = null;
   const { serverManifest } = options;
   const 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) {
+  const runtimeEnv = (0, import_utils.getRuntimeEnv)();
+  if (serverManifest.nestedRoutesJson && ssrByRouteIds && (ssrByRouteIds === null || ssrByRouteIds === void 0 ? void 0 : ssrByRouteIds.length) > 0 && runtimeEnv === "node") {
     const { nestedRoutesJson } = serverManifest;
     const routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
     if (routes) {
-      const { matchRoutes } = await (0, import_utils.compatibleRequire)(require.resolve("@modern-js/runtime-utils/remix-router"), false);
+      const urlPath = "node:url";
+      const { pathToFileURL } = await import(urlPath);
+      const { matchRoutes } = await import(pathToFileURL(require.resolve("@modern-js/runtime-utils/remix-router")).href);
       const url = new URL(request.url);
       const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
       if (!matchedRoutes) {
@@ -189,7 +197,7 @@ async function renderHandler(request, options, mode, onError) {
   } else {
     response = csrRender(options.html);
   }
-  const newRes = (0, import_utils2.transformResponse)(response, injectServerData(serverData));
+  const newRes = (0, import_utils.transformResponse)(response, injectServerData(serverData));
   const { routeInfo } = options;
   applyExtendHeaders(newRes, routeInfo);
   return newRes;
@@ -199,9 +207,8 @@ async function renderHandler(request, options, mode, onError) {
     });
   }
 }
-async function getRenderMode(req, framework, isSSR, forceCSR, nodeReq, onFallback) {
-  const query = (0, import_utils2.parseQuery)(req);
-  const fallbackHeader = `x-${(0, import_universal.cutNameByHyphen)(framework)}-ssr-fallback`;
+async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFallback) {
+  const query = (0, import_utils.parseQuery)(req);
   if (isSSR) {
     if (query.__loader) {
       return "data";

package/dist/cjs/serverBase.js

@@ -100,6 +100,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/plugins/customServer/index.js

@@ -278,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:
@@ -293,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/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

@@ -6,11 +6,10 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 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 { compatibleRequire } from "@modern-js/utils";
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
 import { REPLACE_REG, X_MODERNJS_RENDER } from "../../constants";
-import { ErrorDigest, createErrorHtml, getPathname, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes, transformResponse } from "../../utils";
+import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes, transformResponse } from "../../utils";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
 var DYNAMIC_ROUTE_REG = /\/:./;
@@ -75,16 +74,20 @@ function _createRender() {
         2,
         function() {
           var _ref = _async_to_generator(function(req, param2) {
-            var logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchPathname, loaderContext, forMatchpathname, _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, 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,11 +127,10 @@ 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, forMatchpathname, getHeadersWithoutCookie(headerData));
@@ -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,53 +319,53 @@ 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:
+          response = csrRender(options.html);
+          _state.label = 10;
+        case 10:
           newRes = transformResponse(response, injectServerData(serverData));
           routeInfo = options.routeInfo;
           applyExtendHeaders(newRes, routeInfo);
@@ -365,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/serverBase.js

@@ -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/plugins/customServer/index.js

@@ -141,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/render/inject.js

@@ -7,16 +7,25 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig }) => ({
         var _config_render;
         const { distDirectory: pwd, routes, metaName } = api.useAppContext();
         const config = api.useConfigContext();
+        const hookRunner = api.useHookRunners();
         if (!routes) {
           return;
         }
+        const onFallback = async (reason, utils, error) => {
+          await hookRunner.fallback({
+            reason,
+            ...utils,
+            error
+          });
+        };
         const getRenderHandlerOptions = {
           pwd,
           routes,
           config,
           metaName,
           cacheConfig: ((_config_render = config.render) === null || _config_render === void 0 ? void 0 : _config_render.cache) || cacheConfig,
-          staticGenerate
+          staticGenerate,
+          onFallback
         };
         const render = await getRenderHandler(getRenderHandlerOptions);
         api.setAppContext({
@@ -28,7 +37,7 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig }) => ({
     };
   }
 });
-async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate }) {
+async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback }) {
   var _config_server, _config_security;
   const ssrConfig = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr;
   const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
@@ -40,7 +49,8 @@ async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, st
     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 render;
 }

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

@@ -1,8 +1,7 @@
-import { compatibleRequire } from "@modern-js/utils";
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
 import { REPLACE_REG, X_MODERNJS_RENDER } from "../../constants";
-import { ErrorDigest, createErrorHtml, getPathname, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes, transformResponse } from "../../utils";
+import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes, transformResponse } from "../../utils";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
 const DYNAMIC_ROUTE_REG = /\/:./;
@@ -46,7 +45,11 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
   return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchPathname, loaderContext }) => {
     const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : getPathname(req);
     const [routeInfo, params] = matchRoute(router, forMatchpathname);
+    const framework = metaName || "modern-js";
+    const fallbackHeader = `x-${cutNameByHyphen(framework)}-ssr-fallback`;
+    let fallbackReason = null;
     const onFallback = async (reason, error) => {
+      fallbackReason = reason;
       return onFallbackFn === null || onFallbackFn === void 0 ? void 0 : onFallbackFn(reason, {
         logger,
         reporter,
@@ -70,8 +73,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         }
       });
     }
-    const renderMode = await getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR, nodeReq, onFallback);
-    const pathname = getPathname(req);
+    const renderMode = await getRenderMode(req, fallbackHeader, routeInfo.isSSR, forceCSR, nodeReq, onFallback);
     const headerData = 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, forMatchpathname, getHeadersWithoutCookie(headerData));
@@ -114,6 +116,9 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       default:
         throw new Error(`Unknown render mode: ${renderMode}`);
     }
+    if (fallbackReason) {
+      response.headers.set(fallbackHeader, `1;reason=${fallbackReason}`);
+    }
     return response;
   };
 }
@@ -128,11 +133,14 @@ async function renderHandler(request, options, mode, onError) {
   let response = null;
   const { serverManifest } = options;
   const 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) {
+  const runtimeEnv = getRuntimeEnv();
+  if (serverManifest.nestedRoutesJson && ssrByRouteIds && (ssrByRouteIds === null || ssrByRouteIds === void 0 ? void 0 : ssrByRouteIds.length) > 0 && runtimeEnv === "node") {
     const { nestedRoutesJson } = serverManifest;
     const routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
     if (routes) {
-      const { matchRoutes } = await compatibleRequire(require.resolve("@modern-js/runtime-utils/remix-router"), false);
+      const urlPath = "node:url";
+      const { pathToFileURL } = await import(urlPath);
+      const { matchRoutes } = await import(pathToFileURL(require.resolve("@modern-js/runtime-utils/remix-router")).href);
       const url = new URL(request.url);
       const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
       if (!matchedRoutes) {
@@ -166,9 +174,8 @@ async function renderHandler(request, options, mode, onError) {
     });
   }
 }
-async function getRenderMode(req, framework, isSSR, forceCSR, nodeReq, onFallback) {
+async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFallback) {
   const query = parseQuery(req);
-  const fallbackHeader = `x-${cutNameByHyphen(framework)}-ssr-fallback`;
   if (isSSR) {
     if (query.__loader) {
       return "data";

package/dist/esm-node/serverBase.js

@@ -76,6 +76,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/types/plugins/render/inject.d.ts

@@ -4,4 +4,4 @@ export interface InjectRenderHandlerOptions {
     cacheConfig?: CacheConfig;
 }
 export declare const injectRenderHandlerPlugin: ({ staticGenerate, cacheConfig, }: InjectRenderHandlerOptions) => ServerPlugin;
-export declare function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, }: GetRenderHandlerOptions): Promise<Render>;
+export declare function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback, }: GetRenderHandlerOptions): Promise<Render>;

package/dist/types/plugins/render/render.d.ts

@@ -1,11 +1,6 @@
-import type { Logger, Metrics, Reporter, ServerRoute } from '@modern-js/types';
-import type { CacheConfig, FallbackReason, UserConfig } from '../../types';
+import type { ServerRoute } from '@modern-js/types';
+import type { CacheConfig, OnFallback, UserConfig } from '../../types';
 import type { Render } from '../../types';
-export type OnFallback = (reason: FallbackReason, utils: {
-    logger: Logger;
-    metrics?: Metrics;
-    reporter?: Reporter;
-}, error?: unknown) => Promise<void>;
 interface CreateRenderOptions {
     pwd: string;
     routes: ServerRoute[];

package/dist/types/types/plugin.d.ts

@@ -27,6 +27,11 @@ type FallbackInput = {
     metrics?: Metrics;
     reporter?: Reporter;
 };
+export type OnFallback = (reason: FallbackReason, utils: {
+    logger: Logger;
+    metrics?: Metrics;
+    reporter?: Reporter;
+}, error?: unknown) => Promise<void>;
 export type APIServerStartInput = {
     pwd: string;
     prefix?: string;
@@ -100,6 +105,7 @@ export interface GetRenderHandlerOptions {
     pwd: string;
     routes: ServerRoute[];
     config: UserConfig;
+    onFallback?: OnFallback;
     cacheConfig?: CacheConfig;
     staticGenerate?: boolean;
     metaName?: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.3",
+  "version": "2.59.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -53,9 +53,9 @@
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.0",
-    "@modern-js/plugin": "2.58.3",
-    "@modern-js/runtime-utils": "2.58.3",
-    "@modern-js/utils": "2.58.3"
+    "@modern-js/plugin": "2.59.0",
+    "@modern-js/utils": "2.59.0",
+    "@modern-js/runtime-utils": "2.59.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -65,9 +65,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.58.3",
-    "@scripts/build": "2.58.3",
-    "@scripts/jest-config": "2.58.3"
+    "@modern-js/types": "2.59.0",
+    "@scripts/build": "2.59.0",
+    "@scripts/jest-config": "2.59.0"
   },
   "sideEffects": false,
   "publishConfig": {