@modern-js/server-core 3.8.2 → 3.9.0

package/dist/cjs/plugins/compat/hooks.js

@@ -33,7 +33,6 @@ function getHookRunners(context) {
         config: (params)=>hooks.modifyConfig.call(params),
         prepare: ()=>hooks.onPrepare.call(),
         reset: (params)=>hooks.onReset.call(params),
-        fallback: (input)=>hooks.fallback.call(input),
         prepareWebServer: (input)=>hooks.prepareWebServer.call(input),
         prepareApiServer: (input)=>hooks.prepareApiServer.call(input),
         afterMatch: (ctx)=>hooks.afterMatch.call(ctx),

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

@@ -36,7 +36,6 @@ const external_hooks_js_namespaceObject = require("./hooks.js");
 const compatPlugin = ()=>({
         name: '@modern-js/server-compat',
         registryHooks: {
-            fallback: (0, plugin_namespaceObject.createAsyncHook)(),
             prepareWebServer: (0, plugin_namespaceObject.createAsyncPipelineHook)(),
             prepareApiServer: (0, plugin_namespaceObject.createAsyncPipelineHook)(),
             afterMatch: (0, plugin_namespaceObject.createAsyncPipelineHook)(),

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

@@ -38,23 +38,14 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig })=>({
             api.onPrepare(async ()=>{
                 const { distDirectory: pwd, routes, metaName } = api.getServerContext();
                 const config = api.getServerConfig();
-                const hooks = api.getHooks();
                 if (!routes) return;
-                const onFallback = async (reason, error, context)=>{
-                    await hooks.fallback.call({
-                        reason,
-                        error,
-                        context
-                    });
-                };
                 const getRenderHandlerOptions = {
                     pwd: pwd,
                     routes,
                     config,
                     metaName,
                     cacheConfig: cacheConfig,
-                    staticGenerate,
-                    onFallback
+                    staticGenerate
                 };
                 const render = await getRenderHandler(getRenderHandlerOptions);
                 api.updateServerContext({
@@ -64,7 +55,7 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig })=>({
             });
         }
     });
-async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback }) {
+async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate }) {
     const ssrConfig = config.server?.ssr;
     const ssrByEntries = config.server?.ssrByEntries;
     const forceCSR = 'object' == typeof ssrConfig ? ssrConfig.forceCSR : false;
@@ -81,8 +72,7 @@ async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, st
         forceCSR,
         forceCSRMap,
         nonce: config.security?.nonce,
-        metaName: metaName || 'modern-js',
-        onFallback
+        metaName: metaName || 'modern-js'
     });
     return render;
 }

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

@@ -108,7 +108,7 @@ var __webpack_exports__ = {};
         delete _headers.cookie;
         return _headers;
     }
-    async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, onFallback }) {
+    async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config }) {
         const router = getRouter(routes);
         return async (req, { monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext, contextForceCSR, reporter })=>{
             const forMatchpathname = matchPathname ?? (0, index_js_namespaceObject.getPathname)(req);
@@ -116,13 +116,14 @@ var __webpack_exports__ = {};
             const framework = (0, universal_namespaceObject.cutNameByHyphen)(metaName || 'modern-js');
             const fallbackHeader = `x-${framework}-ssr-fallback`;
             let fallbackReason = null;
-            const fallbackContext = {
-                request: req,
-                monitors
-            };
-            const fallbackWrapper = async (reason, error)=>{
+            const fallbackWrapper = (reason)=>{
                 fallbackReason = reason;
-                return onFallback?.(reason, error, fallbackContext);
+                monitors?.warn('fallback to CSR reason: %o', {
+                    type: reason
+                });
+                monitors?.counter('ssr-fallback', {
+                    type: reason
+                });
             };
             if (!routeInfo) return new Response((0, index_js_namespaceObject.createErrorHtml)(404), {
                 status: 404,
@@ -217,7 +218,7 @@ var __webpack_exports__ = {};
             response = await (0, external_ssrRender_js_namespaceObject.ssrRender)(request, options);
         } catch (e) {
             options.onError(e, index_js_namespaceObject.ErrorDigest.ERENDER);
-            await fallbackWrapper('error', e);
+            fallbackWrapper('error');
             response = await csrRender(request, {
                 ...options,
                 html: injectFallbackReasonToHtml({

package/dist/esm/plugins/compat/hooks.mjs

@@ -4,7 +4,6 @@ function getHookRunners(context) {
         config: (params)=>hooks.modifyConfig.call(params),
         prepare: ()=>hooks.onPrepare.call(),
         reset: (params)=>hooks.onReset.call(params),
-        fallback: (input)=>hooks.fallback.call(input),
         prepareWebServer: (input)=>hooks.prepareWebServer.call(input),
         prepareApiServer: (input)=>hooks.prepareApiServer.call(input),
         afterMatch: (ctx)=>hooks.afterMatch.call(ctx),

package/dist/esm/plugins/compat/index.mjs

@@ -1,9 +1,8 @@
-import { createAsyncHook, createAsyncPipelineHook } from "@modern-js/plugin";
+import { createAsyncPipelineHook } from "@modern-js/plugin";
 import { getHookRunners, handleSetupResult } from "./hooks.mjs";
 const compatPlugin = ()=>({
         name: '@modern-js/server-compat',
         registryHooks: {
-            fallback: createAsyncHook(),
             prepareWebServer: createAsyncPipelineHook(),
             prepareApiServer: createAsyncPipelineHook(),
             afterMatch: createAsyncPipelineHook(),

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

@@ -5,23 +5,14 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig })=>({
             api.onPrepare(async ()=>{
                 const { distDirectory: pwd, routes, metaName } = api.getServerContext();
                 const config = api.getServerConfig();
-                const hooks = api.getHooks();
                 if (!routes) return;
-                const onFallback = async (reason, error, context)=>{
-                    await hooks.fallback.call({
-                        reason,
-                        error,
-                        context
-                    });
-                };
                 const getRenderHandlerOptions = {
                     pwd: pwd,
                     routes,
                     config,
                     metaName,
                     cacheConfig: cacheConfig,
-                    staticGenerate,
-                    onFallback
+                    staticGenerate
                 };
                 const render = await getRenderHandler(getRenderHandlerOptions);
                 api.updateServerContext({
@@ -31,7 +22,7 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig })=>({
             });
         }
     });
-async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback }) {
+async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate }) {
     const ssrConfig = config.server?.ssr;
     const ssrByEntries = config.server?.ssrByEntries;
     const forceCSR = 'object' == typeof ssrConfig ? ssrConfig.forceCSR : false;
@@ -48,8 +39,7 @@ async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, st
         forceCSR,
         forceCSRMap,
         nonce: config.security?.nonce,
-        metaName: metaName || 'modern-js',
-        onFallback
+        metaName: metaName || 'modern-js'
     });
     return render;
 }

package/dist/esm/plugins/render/render.mjs

@@ -8,10 +8,10 @@ import { renderRscHandler } from "./renderRscHandler.mjs";
 import { serverActionHandler } from "./serverActionHandler.mjs";
 import { ssrRender } from "./ssrRender.mjs";
 import { __webpack_require__ } from "../../rslib-runtime.mjs";
-import * as __rspack_external__modern_js_runtime_utils_router_2aa8d96f from "@modern-js/runtime-utils/router";
+import * as __rspack_external__modern_js_runtime_utils_router_4aa9f9b0 from "@modern-js/runtime-utils/router";
 __webpack_require__.add({
     5327 (module) {
-        module.exports = __rspack_external__modern_js_runtime_utils_router_2aa8d96f;
+        module.exports = __rspack_external__modern_js_runtime_utils_router_4aa9f9b0;
     }
 });
 const DYNAMIC_ROUTE_REG = /\/:./;
@@ -67,7 +67,7 @@ function getHeadersWithoutCookie(headers) {
     delete _headers.cookie;
     return _headers;
 }
-async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, onFallback }) {
+async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config }) {
     const router = getRouter(routes);
     return async (req, { monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext, contextForceCSR, reporter })=>{
         const forMatchpathname = matchPathname ?? getPathname(req);
@@ -75,13 +75,14 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         const framework = cutNameByHyphen(metaName || 'modern-js');
         const fallbackHeader = `x-${framework}-ssr-fallback`;
         let fallbackReason = null;
-        const fallbackContext = {
-            request: req,
-            monitors
-        };
-        const fallbackWrapper = async (reason, error)=>{
+        const fallbackWrapper = (reason)=>{
             fallbackReason = reason;
-            return onFallback?.(reason, error, fallbackContext);
+            monitors?.warn('fallback to CSR reason: %o', {
+                type: reason
+            });
+            monitors?.counter('ssr-fallback', {
+                type: reason
+            });
         };
         if (!routeInfo) return new Response(createErrorHtml(404), {
             status: 404,
@@ -176,7 +177,7 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
         response = await ssrRender(request, options);
     } catch (e) {
         options.onError(e, ErrorDigest.ERENDER);
-        await fallbackWrapper('error', e);
+        fallbackWrapper('error');
         response = await csrRender(request, {
             ...options,
             html: injectFallbackReasonToHtml({

package/dist/esm-node/plugins/compat/hooks.mjs

@@ -5,7 +5,6 @@ function getHookRunners(context) {
         config: (params)=>hooks.modifyConfig.call(params),
         prepare: ()=>hooks.onPrepare.call(),
         reset: (params)=>hooks.onReset.call(params),
-        fallback: (input)=>hooks.fallback.call(input),
         prepareWebServer: (input)=>hooks.prepareWebServer.call(input),
         prepareApiServer: (input)=>hooks.prepareApiServer.call(input),
         afterMatch: (ctx)=>hooks.afterMatch.call(ctx),

package/dist/esm-node/plugins/compat/index.mjs

@@ -1,10 +1,9 @@
 import "node:module";
-import { createAsyncHook, createAsyncPipelineHook } from "@modern-js/plugin";
+import { createAsyncPipelineHook } from "@modern-js/plugin";
 import { getHookRunners, handleSetupResult } from "./hooks.mjs";
 const compatPlugin = ()=>({
         name: '@modern-js/server-compat',
         registryHooks: {
-            fallback: createAsyncHook(),
             prepareWebServer: createAsyncPipelineHook(),
             prepareApiServer: createAsyncPipelineHook(),
             afterMatch: createAsyncPipelineHook(),

package/dist/esm-node/plugins/render/inject.mjs

@@ -6,23 +6,14 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig })=>({
             api.onPrepare(async ()=>{
                 const { distDirectory: pwd, routes, metaName } = api.getServerContext();
                 const config = api.getServerConfig();
-                const hooks = api.getHooks();
                 if (!routes) return;
-                const onFallback = async (reason, error, context)=>{
-                    await hooks.fallback.call({
-                        reason,
-                        error,
-                        context
-                    });
-                };
                 const getRenderHandlerOptions = {
                     pwd: pwd,
                     routes,
                     config,
                     metaName,
                     cacheConfig: cacheConfig,
-                    staticGenerate,
-                    onFallback
+                    staticGenerate
                 };
                 const render = await getRenderHandler(getRenderHandlerOptions);
                 api.updateServerContext({
@@ -32,7 +23,7 @@ const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig })=>({
             });
         }
     });
-async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback }) {
+async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate }) {
     const ssrConfig = config.server?.ssr;
     const ssrByEntries = config.server?.ssrByEntries;
     const forceCSR = 'object' == typeof ssrConfig ? ssrConfig.forceCSR : false;
@@ -49,8 +40,7 @@ async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, st
         forceCSR,
         forceCSRMap,
         nonce: config.security?.nonce,
-        metaName: metaName || 'modern-js',
-        onFallback
+        metaName: metaName || 'modern-js'
     });
     return render;
 }

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

@@ -9,10 +9,10 @@ import { renderRscHandler } from "./renderRscHandler.mjs";
 import { serverActionHandler } from "./serverActionHandler.mjs";
 import { ssrRender } from "./ssrRender.mjs";
 import { __webpack_require__ } from "../../rslib-runtime.mjs";
-import * as __rspack_external__modern_js_runtime_utils_router_2aa8d96f from "@modern-js/runtime-utils/router";
+import * as __rspack_external__modern_js_runtime_utils_router_4aa9f9b0 from "@modern-js/runtime-utils/router";
 __webpack_require__.add({
     "@modern-js/runtime-utils/router" (module) {
-        module.exports = __rspack_external__modern_js_runtime_utils_router_2aa8d96f;
+        module.exports = __rspack_external__modern_js_runtime_utils_router_4aa9f9b0;
     }
 });
 const DYNAMIC_ROUTE_REG = /\/:./;
@@ -68,7 +68,7 @@ function getHeadersWithoutCookie(headers) {
     delete _headers.cookie;
     return _headers;
 }
-async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, onFallback }) {
+async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config }) {
     const router = getRouter(routes);
     return async (req, { monitors, nodeReq, templates, serverManifest, rscClientManifest, rscSSRManifest, rscServerManifest, locals, matchEntryName, matchPathname, loaderContext, contextForceCSR, reporter })=>{
         const forMatchpathname = matchPathname ?? getPathname(req);
@@ -76,13 +76,14 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
         const framework = cutNameByHyphen(metaName || 'modern-js');
         const fallbackHeader = `x-${framework}-ssr-fallback`;
         let fallbackReason = null;
-        const fallbackContext = {
-            request: req,
-            monitors
-        };
-        const fallbackWrapper = async (reason, error)=>{
+        const fallbackWrapper = (reason)=>{
             fallbackReason = reason;
-            return onFallback?.(reason, error, fallbackContext);
+            monitors?.warn('fallback to CSR reason: %o', {
+                type: reason
+            });
+            monitors?.counter('ssr-fallback', {
+                type: reason
+            });
         };
         if (!routeInfo) return new Response(createErrorHtml(404), {
             status: 404,
@@ -177,7 +178,7 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
         response = await ssrRender(request, options);
     } catch (e) {
         options.onError(e, ErrorDigest.ERENDER);
-        await fallbackWrapper('error', e);
+        fallbackWrapper('error');
         response = await csrRender(request, {
             ...options,
             html: injectFallbackReasonToHtml({

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, onFallback, }: GetRenderHandlerOptions): Promise<Render>;
+export declare function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, }: GetRenderHandlerOptions): Promise<Render>;

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

@@ -1,6 +1,6 @@
 import type { ServerRoute } from '@modern-js/types';
 import type { Router } from 'hono/router';
-import type { CacheConfig, OnFallback, UserConfig } from '../../types';
+import type { CacheConfig, UserConfig } from '../../types';
 import type { Render } from '../../types';
 import type { Params } from '../../types/requestHandler';
 interface CreateRenderOptions {
@@ -9,7 +9,6 @@ interface CreateRenderOptions {
     config: UserConfig;
     cacheConfig?: CacheConfig;
     staticGenerate?: boolean;
-    onFallback?: OnFallback;
     metaName?: string;
     forceCSR?: boolean;
     forceCSRMap?: Map<string, boolean>;
@@ -17,5 +16,5 @@ interface CreateRenderOptions {
 }
 type MatchedRoute = [ServerRoute | undefined, Params];
 export declare function matchRoute(router: Router<ServerRoute>, pathname: string, entryName?: string): MatchedRoute;
-export declare function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, onFallback, }: CreateRenderOptions): Promise<Render>;
+export declare function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, forceCSRMap, config, }: CreateRenderOptions): Promise<Render>;
 export {};

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

@@ -1,20 +1,9 @@
-import type { CacheOption, Container, HttpMethodDecider, MiddlewareContext, Monitors, ServerRoute } from '@modern-js/types';
+import type { CacheOption, Container, HttpMethodDecider, MiddlewareContext, ServerRoute } from '@modern-js/types';
 import type { Context, MiddlewareHandler } from 'hono';
 import type { UserConfig } from '../config';
 import type { Render } from '../render';
 import type { ServerPlugin } from './plugin';
 export type { FileChangeEvent, ResetEvent } from '@modern-js/plugin';
-export type FallbackReason = 'error' | 'header' | 'query' | `header,${string}`;
-export type FallbackContext = {
-    request: Request;
-    monitors?: Monitors;
-};
-export type FallbackInput = {
-    reason: FallbackReason;
-    error: unknown;
-    context?: FallbackContext;
-};
-export type OnFallback = (reason: FallbackReason, error?: unknown, context?: FallbackContext) => Promise<void>;
 export type APIServerStartInput = {
     pwd: string;
     prefix?: string;
@@ -44,7 +33,6 @@ export interface GetRenderHandlerOptions {
     pwd: string;
     routes: ServerRoute[];
     config: UserConfig;
-    onFallback?: OnFallback;
     cacheConfig?: CacheConfig;
     staticGenerate?: boolean;
     metaName?: string;

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

@@ -1,2 +1,2 @@
 export * from './plugin';
-export type { ServerConfig, CacheConfig, OnFallback, FallbackReason, FallbackContext, GetRenderHandlerOptions, FileChangeEvent, FallbackInput, WebServerStartInput, APIServerStartInput, ServerMiddleware, MiddlewareObj, } from './base';
+export type { ServerConfig, CacheConfig, GetRenderHandlerOptions, FileChangeEvent, WebServerStartInput, APIServerStartInput, ServerMiddleware, MiddlewareObj, } from './base';

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

@@ -1,10 +1,9 @@
-import type { AsyncHook, AsyncPipelineHook, ServerContext as BaseServerContext, ServerPlugin as BaseServerPlugin, ServerPluginAPI as BaseServerPluginAPI, ServerPluginExtends as BaseServerPluginExtends } from '@modern-js/plugin';
+import type { AsyncPipelineHook, ServerContext as BaseServerContext, ServerPlugin as BaseServerPlugin, ServerPluginAPI as BaseServerPluginAPI, ServerPluginExtends as BaseServerPluginExtends } from '@modern-js/plugin';
 import type { Hooks } from '@modern-js/plugin/server';
 import type { AfterMatchContext, AfterRenderContext, AfterStreamingRenderContext } from '@modern-js/types';
 import type { MiddlewareHandler } from 'hono';
 import type { MiddlewareObj } from './base';
-import type { APIServerStartInput, FallbackInput, ServerConfig, WebAdapter, WebServerStartInput } from './base';
-export type FallbackFn = (input: FallbackInput) => Promise<FallbackInput>;
+import type { APIServerStartInput, ServerConfig, WebAdapter, WebServerStartInput } from './base';
 export type PrepareWebServerFn = (input: WebServerStartInput) => Promise<WebAdapter | null>;
 export type PrepareApiServerFn = (input: APIServerStartInput) => Promise<MiddlewareHandler>;
 export type AfterMatchFn = (ctx: AfterMatchContext) => Promise<any>;
@@ -19,7 +18,6 @@ export interface ServerPluginExtends extends BaseServerPluginExtends {
     };
     extendHooks: {
         prepareWebServer: AsyncPipelineHook<PrepareWebServerFn>;
-        fallback: AsyncHook<FallbackFn>;
         prepareApiServer: AsyncPipelineHook<PrepareApiServerFn>;
         afterMatch: AsyncPipelineHook<AfterMatchFn>;
         afterRender: AsyncPipelineHook<AfterRenderFn>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.8.2",
+  "version": "3.9.0",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -68,12 +68,12 @@
     "@web-std/file": "^3.0.3",
     "@web-std/stream": "^1.0.3",
     "cloneable-readable": "^3.0.0",
-    "flatted": "^3.4.2",
+    "flatted": "^3.4.4",
     "hono": "^4.11.7",
     "ts-deepmerge": "7.0.3",
-    "@modern-js/plugin": "3.8.2",
-    "@modern-js/runtime-utils": "3.8.2",
-    "@modern-js/utils": "3.8.2"
+    "@modern-js/plugin": "3.9.0",
+    "@modern-js/runtime-utils": "3.9.0",
+    "@modern-js/utils": "3.9.0"
   },
   "devDependencies": {
     "@rslib/core": "0.23.2",
@@ -83,7 +83,7 @@
     "http-proxy-middleware": "^2.0.10",
     "typescript": "^5",
     "@modern-js/rslib": "2.68.10",
-    "@modern-js/types": "3.8.2",
+    "@modern-js/types": "3.9.0",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,