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

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,10 +1,9 @@
 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";
 const DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
   const dynamicRoutes = [];
@@ -28,8 +27,7 @@ function getRouter(routes) {
   }
   return router;
 }
-function matchRoute(router, request) {
-  const pathname = getPathname(request);
+function matchRoute(router, pathname) {
   const matched = router.match("*", pathname);
   const result = matched[0][0];
   return result || [];
@@ -44,9 +42,14 @@ 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 : 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,11 +73,10 @@ 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, 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");
@@ -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) {
@@ -156,12 +164,7 @@ async function renderHandler(request, options, mode, onError) {
   } else {
     response = csrRender(options.html);
   }
-  let newRes;
-  if (!options.staticGenerate) {
-    newRes = transformResponse(response, injectServerData(serverData));
-  } else {
-    newRes = response;
-  }
+  const newRes = transformResponse(response, injectServerData(serverData));
   const { routeInfo } = options;
   applyExtendHeaders(newRes, routeInfo);
   return newRes;
@@ -171,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/plugins/render/ssrRender.js

@@ -1,7 +1,7 @@
 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";
 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 }) {
   var _serverManifest_renderBundles;

package/dist/esm-node/serverBase.js

@@ -1,7 +1,7 @@
 import { _ as _class_private_method_get } from "@swc/helpers/_/_class_private_method_get";
 import { _ as _class_private_method_init } from "@swc/helpers/_/_class_private_method_init";
-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();
 class ServerBase {
@@ -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/adapters/node/hono.d.ts

@@ -1,4 +1,4 @@
-import type { NodeRequest, NodeResponse, Context, HonoRequest, ServerEnv, Middleware, Next, ServerManifest } from '../../types';
+import type { Context, HonoRequest, Middleware, Next, NodeRequest, NodeResponse, ServerEnv, ServerManifest } from '../../types';
 type NodeBindings = {
     node: {
         req: NodeRequest & {
@@ -6,7 +6,9 @@ type NodeBindings = {
             __templates?: Record<string, string>;
             __serverManifest?: ServerManifest;
         };
-        res: NodeResponse;
+        res: NodeResponse & {
+            _modernBodyPiped?: boolean;
+        };
     };
 };
 export type ServerNodeEnv = {

package/dist/types/adapters/node/plugins/nodeServer.d.ts

@@ -1,4 +1,4 @@
-import type { ServerPlugin, NodeServer } from '../../../types';
+import type { NodeServer, ServerPlugin } from '../../../types';
 export declare const injectNodeSeverPlugin: ({ nodeServer, }: {
     nodeServer: NodeServer;
 }) => ServerPlugin;

package/dist/types/adapters/node/plugins/static.d.ts

@@ -1,5 +1,5 @@
 import type { ServerRoute } from '@modern-js/types';
-import type { OutputNormalizedConfig, HtmlNormalizedConfig, Middleware, ServerPlugin } from '../../../types';
+import type { HtmlNormalizedConfig, Middleware, OutputNormalizedConfig, ServerPlugin } from '../../../types';
 export declare const serverStaticPlugin: () => ServerPlugin;
 export type PublicMiddlwareOptions = {
     pwd: string;

package/dist/types/pluginManager.d.ts

@@ -1,4 +1,4 @@
-import type { AppContext, CliConfig, ServerPlugin, ServerConfig } from './types';
+import type { AppContext, CliConfig, ServerConfig, ServerPlugin } from './types';
 export interface PluginManagerOptions {
     cliConfig: CliConfig;
     appContext: AppContext;

package/dist/types/plugins/customServer/context.d.ts

@@ -1,6 +1,6 @@
-import type { AfterMatchContext, AfterRenderContext, MiddlewareContext, AfterStreamingRenderContext, ServerRoute, HookContext } from '@modern-js/types';
-import type { Context, ServerEnv } from '../../types';
+import type { AfterMatchContext, AfterRenderContext, AfterStreamingRenderContext, HookContext, MiddlewareContext, ServerRoute } from '@modern-js/types';
 import type { ServerNodeEnv } from '../../adapters/node/hono';
+import type { Context, ServerEnv } from '../../types';
 import { type ResArgs } from './base';
 export declare function getAfterMatchCtx(entryName: string, baseHookCtx: HookContext): AfterMatchContext;
 export declare function getAfterRenderCtx(c: Context, baseHookCtx: HookContext, route: Partial<ServerRoute>): Promise<AfterRenderContext>;

package/dist/types/plugins/customServer/index.d.ts

@@ -1,7 +1,7 @@
 import type { ServerRoute, UnstableMiddleware } from '@modern-js/types';
-import type { ServerBase } from '../../serverBase';
-import type { ServerHookRunner, Middleware, ServerEnv } from '../../types';
 import type { ServerNodeEnv } from '../../adapters/node/hono';
+import type { ServerBase } from '../../serverBase';
+import type { Middleware, ServerEnv, ServerHookRunner } from '../../types';
 export declare class CustomServer {
     private runner;
     private serverMiddlewarePromise;

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/plugins/render/ssrRender.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import type { IncomingMessage } from 'http';
-import type { Reporter, ServerRoute, Logger, Metrics } from '@modern-js/types';
-import type { OnError, OnTiming, Params } from '../../types/requestHandler';
+import type { Logger, Metrics, Reporter, ServerRoute } from '@modern-js/types';
 import type { CacheConfig, ServerManifest, UserConfig } from '../../types';
+import type { OnError, OnTiming, Params } from '../../types/requestHandler';
 export interface SSRRenderOptions {
     pwd: string;
     html: string;

package/dist/types/serverBase.d.ts

@@ -15,6 +15,7 @@ export type ServerBaseOptions = {
     metaName?: string;
     routes?: ServerRoute[];
     appContext: {
+        internalDirectory?: string;
         appDirectory?: string;
         sharedDirectory?: string;
         apiDirectory?: string;

package/dist/types/types/config/bff.d.ts

@@ -1,5 +1,5 @@
-import type { Options } from 'http-proxy-middleware';
 import type { HttpMethodDecider } from '@modern-js/types';
+import type { Options } from 'http-proxy-middleware';
 export interface BffUserConfig {
     prefix?: string;
     proxy?: Record<string, Options>;

package/dist/types/types/config/server.d.ts

@@ -6,32 +6,9 @@ type Route = string | string[] | {
     resHeaders?: Record<string, unknown>;
 };
 export type Routes = Record<string, Route>;
-type PreloadLink = {
-    url: string;
-    as?: string;
-    rel?: string;
-};
-type PreloadInclude = Array<string | PreloadLink>;
-interface PreloadAttributes {
-    script?: Record<string, boolean | string>;
-    style?: Record<string, boolean | string>;
-    image?: Record<string, boolean | string>;
-    font?: Record<string, boolean | string>;
-}
-export type SSRPreload = {
-    /** Include external preload links to enhance the page's performance by preloading additional resources. */
-    include?: PreloadInclude;
-    /** Utilize string matching to exclude specific preload links. */
-    exclude?: RegExp | string;
-    /** Disable preload when the User-Agent is matched.  */
-    userAgentFilter?: RegExp | string;
-    /** Include additional attributes to the Header Link.  */
-    attributes?: PreloadAttributes;
-};
 export type SSR = boolean | {
     forceCSR?: boolean;
     mode?: SSRMode;
-    preload?: boolean | SSRPreload;
     inlineScript?: boolean;
     disablePrerender?: boolean;
     unsafeHeaders?: string[];

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /** Hooks */
-import type { Server as NodeServer, IncomingMessage, ServerResponse } from 'http';
-import type { AsyncWaterfall, ParallelWorkflow, ToRunners, ToThreads, CommonAPI, PluginOptions, AsyncSetup, createContext, AsyncPipeline } from '@modern-js/plugin';
+import type { IncomingMessage, Server as NodeServer, ServerResponse } from 'http';
+import type { AsyncPipeline, AsyncSetup, AsyncWaterfall, CommonAPI, ParallelWorkflow, PluginOptions, ToRunners, ToThreads, createContext } from '@modern-js/plugin';
 import type { AfterMatchContext, AfterRenderContext, AfterStreamingRenderContext, CacheOption, Container, HttpMethodDecider, ISAppContext, Logger, Metrics, MiddlewareContext, Reporter, ServerRoute, UnstableMiddleware } from '@modern-js/types';
 import type { MiddlewareHandler } from 'hono';
 import type { UserConfig } from './config';
@@ -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/dist/types/types/render.d.ts

@@ -14,6 +14,8 @@ export interface RenderOptions {
     metrics?: Metrics;
     /** @deprecated */
     reporter?: Reporter;
+    /** For compat rewrite MPA, while not modify request  */
+    matchPathname?: string;
     monitors?: Monitors;
     serverManifest: ServerManifest;
     nodeReq?: IncomingMessage;

package/dist/types/types/requestHandler.d.ts

@@ -1,4 +1,4 @@
-import type { Metrics, Reporter, ServerRoute, Logger } from '@modern-js/types';
+import type { Logger, Metrics, Reporter, ServerRoute } from '@modern-js/types';
 import type { ServerUserConfig } from './config';
 export type Resource = {
     loadableStats: Record<string, any>;

package/dist/types/types/server.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { Readable } from 'node:stream';
-import type { Metrics, Logger, Reporter, BaseSSRServerContext, ServerRoute, NestedRoute, Monitors } from '@modern-js/types';
+import type { BaseSSRServerContext, Logger, Metrics, Monitors, NestedRoute, Reporter, ServerRoute } from '@modern-js/types';
 import type { RequestHandler as BundleRequestHandler, OnError, OnTiming } from './requestHandler';
 export type SSRServerContext = BaseSSRServerContext & {
     staticGenerate?: boolean;
@@ -40,6 +40,7 @@ type ServerVariables = {
     monitors: Monitors;
     serverManifest?: ServerManifest;
     templates?: Record<string, string>;
+    matchPathname?: string;
     /**
      * Communicating with custom server hook & modern ssrContext.
      *

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.3-alpha.1",
+  "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.2",
-    "@modern-js/utils": "2.58.2",
-    "@modern-js/runtime-utils": "2.58.2"
+    "@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.2",
-    "@scripts/build": "2.58.2",
-    "@scripts/jest-config": "2.58.2"
+    "@modern-js/types": "2.59.0",
+    "@scripts/build": "2.59.0",
+    "@scripts/jest-config": "2.59.0"
   },
   "sideEffects": false,
   "publishConfig": {