@modern-js/server-core 3.8.3 → 3.9.1

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

@@ -7,11 +7,10 @@ import { dataHandler } from "./dataHandler.mjs";
 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_4aa9f9b0 from "@modern-js/runtime-utils/router";
+import { __webpack_require__ } from "../../rslib-runtime~1.mjs";
 __webpack_require__.add({
-    5327 (module) {
-        module.exports = __rspack_external__modern_js_runtime_utils_router_4aa9f9b0;
+    718 (module) {
+        module.exports = require("@modern-js/runtime-utils/router");
     }
 });
 const DYNAMIC_ROUTE_REG = /\/:./;
@@ -67,7 +66,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 +74,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,
@@ -162,7 +162,7 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
         const { nestedRoutesJson } = serverManifest;
         const routes = nestedRoutesJson?.[options.routeInfo.entryName];
         if (routes) {
-            const { matchRoutes } = __webpack_require__(5327);
+            const { matchRoutes } = __webpack_require__(718);
             const url = new URL(request.url);
             const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
             if (matchedRoutes) {
@@ -176,7 +176,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

@@ -8,11 +8,12 @@ import { dataHandler } from "./dataHandler.mjs";
 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_4aa9f9b0 from "@modern-js/runtime-utils/router";
+import { __webpack_require__ } from "../../rslib-runtime~0.mjs";
+import { createRequire as __rspack_createRequire } from "node:module";
+const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
 __webpack_require__.add({
     "@modern-js/runtime-utils/router" (module) {
-        module.exports = __rspack_external__modern_js_runtime_utils_router_4aa9f9b0;
+        module.exports = __rspack_createRequire_require("@modern-js/runtime-utils/router");
     }
 });
 const DYNAMIC_ROUTE_REG = /\/:./;
@@ -68,7 +69,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 +77,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 +179,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/adapters/node/helper/index.d.ts

@@ -1,6 +1,6 @@
-export { loadServerEnv } from './loadEnv';
-export { loadServerPlugins } from './loadPlugin';
-export { loadServerRuntimeConfig, loadServerCliConfig } from './loadConfig';
-export { loadCacheConfig } from './loadCache';
-export { isResFinalized } from './utils';
-export type { NodeBindings } from './utils';
+export { loadServerEnv } from './loadEnv.js';
+export { loadServerPlugins } from './loadPlugin.js';
+export { loadServerRuntimeConfig, loadServerCliConfig } from './loadConfig.js';
+export { loadCacheConfig } from './loadCache.js';
+export { isResFinalized } from './utils.js';
+export type { NodeBindings } from './utils.js';

package/dist/types/adapters/node/helper/loadCache.d.ts

@@ -1,2 +1,2 @@
-import type { CacheConfig } from '../../../types';
+import type { CacheConfig } from '../../../types/index.js';
 export declare function loadCacheConfig(pwd: string): Promise<CacheConfig | undefined>;

package/dist/types/adapters/node/helper/loadConfig.d.ts

@@ -1,3 +1,3 @@
-import type { CliConfig, ServerConfig, UserConfig } from '../../../types';
+import type { CliConfig, ServerConfig, UserConfig } from '../../../types/index.js';
 export declare function loadServerRuntimeConfig(serverConfigPath: string): Promise<ServerConfig | undefined>;
 export declare function loadServerCliConfig(pwd: string, defaultConfig?: UserConfig): CliConfig;

package/dist/types/adapters/node/helper/loadEnv.d.ts

@@ -1,3 +1,3 @@
-import type { ServerBaseOptions } from '../../../serverBase';
+import type { ServerBaseOptions } from '../../../serverBase.js';
 /** 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量 */
 export declare function loadServerEnv(options: ServerBaseOptions): Promise<void>;

package/dist/types/adapters/node/helper/loadPlugin.d.ts

@@ -1,3 +1,3 @@
 import type { ServerPlugin } from '@modern-js/types';
-import type { ServerPlugin as ServerPluginInstance } from '../../../types';
+import type { ServerPlugin as ServerPluginInstance } from '../../../types/index.js';
 export declare function loadServerPlugins(serverPlugins: ServerPlugin[], appDirectory: string): Promise<ServerPluginInstance[]>;

package/dist/types/adapters/node/helper/utils.d.ts

@@ -1,5 +1,5 @@
 import type { ClientManifest, NodeRequest, NodeResponse, SSRManifest } from '@modern-js/types/server';
-import type { HonoRequest, ServerManifest } from '../../../types';
+import type { HonoRequest, ServerManifest } from '../../../types/index.js';
 type ExtendedNodeRequest = NodeRequest & {
     __honoRequest?: HonoRequest;
     __templates?: Record<string, string>;

package/dist/types/adapters/node/hono.d.ts

@@ -1,6 +1,6 @@
 import type { NodeRequest, NodeResponse } from '@modern-js/types/server';
-import type { Context, Middleware, Next, ServerEnv } from '../../types';
-import { type NodeBindings } from './helper';
+import type { Context, Middleware, Next, ServerEnv } from '../../types/index.js';
+import { type NodeBindings } from './helper/index.js';
 export type ServerNodeEnv = {
     Bindings: NodeBindings;
 };

package/dist/types/adapters/node/index.d.ts

@@ -1,5 +1,5 @@
-export { httpCallBack2HonoMid, connectMid2HonoMid, connectMockMid2HonoMid, } from './hono';
-export type { ServerNodeContext, ServerNodeMiddleware } from './hono';
-export { createNodeServer, sendResponse, createWebRequest, } from './node';
-export { serverStaticPlugin, injectResourcePlugin, getHtmlTemplates, getServerManifest, injectNodeSeverPlugin, injectRscManifestPlugin, } from './plugins';
-export { loadServerPlugins, loadServerEnv, loadServerRuntimeConfig, loadServerCliConfig, loadCacheConfig, } from './helper';
+export { httpCallBack2HonoMid, connectMid2HonoMid, connectMockMid2HonoMid, } from './hono.js';
+export type { ServerNodeContext, ServerNodeMiddleware } from './hono.js';
+export { createNodeServer, sendResponse, createWebRequest, } from './node.js';
+export { serverStaticPlugin, injectResourcePlugin, getHtmlTemplates, getServerManifest, injectNodeSeverPlugin, injectRscManifestPlugin, } from './plugins/index.js';
+export { loadServerPlugins, loadServerEnv, loadServerRuntimeConfig, loadServerCliConfig, loadCacheConfig, } from './helper/index.js';

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

@@ -2,7 +2,7 @@ import { type Server as NodeServer } from 'node:http';
 import type { Http2SecureServer } from 'node:http2';
 import type { Server as NodeHttpsServer } from 'node:https';
 import type { NodeRequest, NodeResponse } from '@modern-js/types/server';
-import type { RequestHandler } from '../../types';
+import type { RequestHandler } from '../../types/index.js';
 export declare const createWebRequest: (req: NodeRequest, res: NodeResponse, body?: BodyInit) => Request;
 export declare const sendResponse: (response: Response, res: NodeResponse) => Promise<void>;
 declare const getRequestListener: (handler: RequestHandler) => (req: NodeRequest, res: NodeResponse) => Promise<void>;

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

@@ -1,3 +1,3 @@
-export * from './static';
-export * from './resource';
-export * from './nodeServer';
+export * from './static.js';
+export * from './resource.js';
+export * from './nodeServer.js';

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

@@ -1,6 +1,6 @@
 import type { Server as NodeServer } from 'node:http';
 import type { Http2SecureServer } from 'node:http2';
-import type { ServerPlugin } from '../../../types';
+import type { ServerPlugin } from '../../../types/index.js';
 export declare const injectNodeSeverPlugin: ({ nodeServer, }: {
     nodeServer: NodeServer | Http2SecureServer;
 }) => ServerPlugin;

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

@@ -1,5 +1,5 @@
 import type { Monitors, ServerRoute } from '@modern-js/types';
-import type { Middleware, ServerEnv, ServerManifest, ServerPlugin } from '../../../types';
+import type { Middleware, ServerEnv, ServerManifest, ServerPlugin } from '../../../types/index.js';
 export declare function getHtmlTemplates(pwd: string, routes: ServerRoute[]): Promise<Record<string, string>>;
 export declare function injectTemplates(pwd: string, routes?: ServerRoute[], htmlTemplatePromise?: ReturnType<typeof getHtmlTemplates>): Middleware<ServerEnv>;
 export declare function getServerManifest(pwd: string, routes: ServerRoute[], monitors?: Monitors): Promise<ServerManifest>;

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

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

package/dist/types/helper.d.ts

@@ -1,4 +1,4 @@
-import type { Context } from './types';
+import type { Context } from './types/index.js';
 type LoaderContext = Map<string, unknown>;
 type Var = {
     loaderContext: LoaderContext;

package/dist/types/index.d.ts

@@ -1,14 +1,14 @@
-export { createErrorHtml, onError, ErrorDigest } from './utils';
-export { normalizePublicDir, normalizePublicDirPath, getPublicDirRoutePrefixes, getPublicDirPatterns, resolvePublicDirPaths, getPublicDirConfig, } from './utils/publicDir';
-export { AGGRED_DIR } from './constants';
-export type { ServerBase, ServerBaseOptions } from './serverBase';
-export { createServerBase } from './serverBase';
-export { run, useHonoContext } from './context';
+export { createErrorHtml, onError, ErrorDigest } from './utils/index.js';
+export { normalizePublicDir, normalizePublicDirPath, getPublicDirRoutePrefixes, getPublicDirPatterns, resolvePublicDirPaths, getPublicDirConfig, } from './utils/publicDir.js';
+export { AGGRED_DIR } from './constants.js';
+export type { ServerBase, ServerBaseOptions } from './serverBase.js';
+export { createServerBase } from './serverBase.js';
+export { run, useHonoContext } from './context.js';
 export { Hono } from 'hono';
-export type { Middleware, MiddlewareHandler, Context, Next, HonoRequest as InternalRequest, ServerEnv, ServerManifest, ServerLoaderBundle, } from './types';
-export { getLoaderCtx } from './helper';
-export * from './plugins';
-export * from './types/plugins';
-export * from './types/render';
-export * from './types/config';
-export * from './types/requestHandler';
+export type { Middleware, MiddlewareHandler, Context, Next, HonoRequest as InternalRequest, ServerEnv, ServerManifest, ServerLoaderBundle, } from './types/index.js';
+export { getLoaderCtx } from './helper.js';
+export * from './plugins/index.js';
+export * from './types/plugins/index.js';
+export * from './types/render.js';
+export * from './types/config/index.js';
+export * from './types/requestHandler.js';

package/dist/types/plugins/compat/hooks.d.ts

@@ -1,5 +1,5 @@
 import type { InternalServerContext } from '@modern-js/plugin';
-import type { ServerPluginExtends } from '../../types';
+import type { ServerPluginExtends } from '../../types/index.js';
 /**
  * old plugin useHookRunners function result
  */

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

@@ -1,3 +1,3 @@
-import type { ServerPlugin } from '../../types';
-export { handleSetupResult } from './hooks';
+import type { ServerPlugin } from '../../types/index.js';
+export { handleSetupResult } from './hooks.js';
 export declare const compatPlugin: () => ServerPlugin;

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

@@ -1,6 +1,6 @@
 import type { Logger } from '@modern-js/types';
-import type { ServerPlugin } from '../types';
-import { type InjectRenderHandlerOptions } from './render';
+import type { ServerPlugin } from '../types/index.js';
+import { type InjectRenderHandlerOptions } from './render/index.js';
 export type CreateDefaultPluginsOptions = InjectRenderHandlerOptions & {
     logger?: Logger | false;
 };

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

@@ -1,2 +1,2 @@
-import type { ServerPlugin } from '../types';
+import type { ServerPlugin } from '../types/index.js';
 export declare const faviconPlugin: () => ServerPlugin;

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

@@ -1,8 +1,8 @@
-export { renderPlugin, injectRenderHandlerPlugin, type InjectRenderHandlerOptions, getRenderHandler, } from './render';
-export { faviconPlugin } from './favicon';
-export { injectServerTiming, injectloggerPlugin } from './monitors';
-export { processedByPlugin } from './processedBy';
-export { logPlugin } from './log';
-export { createDefaultPlugins, type CreateDefaultPluginsOptions, } from './default';
-export { compatPlugin, handleSetupResult } from './compat';
-export { injectConfigMiddlewarePlugin } from './middlewares';
+export { renderPlugin, injectRenderHandlerPlugin, type InjectRenderHandlerOptions, getRenderHandler, } from './render/index.js';
+export { faviconPlugin } from './favicon.js';
+export { injectServerTiming, injectloggerPlugin } from './monitors.js';
+export { processedByPlugin } from './processedBy.js';
+export { logPlugin } from './log.js';
+export { createDefaultPlugins, type CreateDefaultPluginsOptions, } from './default.js';
+export { compatPlugin, handleSetupResult } from './compat/index.js';
+export { injectConfigMiddlewarePlugin } from './middlewares.js';

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

@@ -1,2 +1,2 @@
-import type { ServerPlugin } from '../types';
+import type { ServerPlugin } from '../types/index.js';
 export declare const logPlugin: () => ServerPlugin;

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

@@ -1,2 +1,2 @@
-import type { MiddlewareObj, ServerPlugin } from '../types';
+import type { MiddlewareObj, ServerPlugin } from '../types/index.js';
 export declare const injectConfigMiddlewarePlugin: (configMiddlewares?: MiddlewareObj[], configRenderMiddlewares?: MiddlewareObj[]) => ServerPlugin;

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

@@ -1,5 +1,5 @@
 import type { Logger } from '@modern-js/types';
-import type { Context, Next, ServerEnv, ServerPlugin } from '../types';
+import type { Context, Next, ServerEnv, ServerPlugin } from '../types/index.js';
 export declare const initMonitorsPlugin: () => ServerPlugin;
 export declare const injectloggerPlugin: (inputLogger: Logger) => ServerPlugin;
 export declare const injectServerTiming: () => ServerPlugin;

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

@@ -1,2 +1,2 @@
-import type { ServerPlugin } from '../types';
+import type { ServerPlugin } from '../types/index.js';
 export declare const processedByPlugin: () => ServerPlugin;

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

@@ -1,2 +1,2 @@
-import type { SSRRenderOptions } from './ssrRender';
+import type { SSRRenderOptions } from './ssrRender.js';
 export declare const csrRscRender: (req: Request, options: SSRRenderOptions) => Promise<Response>;

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

@@ -1,5 +1,5 @@
 import type { ServerRoute } from '@modern-js/types';
-import type { SSRRenderOptions } from './ssrRender';
+import type { SSRRenderOptions } from './ssrRender.js';
 export declare const dataHandler: (request: Request, { routeInfo, serverRoutes, monitors, onError, onTiming, serverManifest, loaderContext, }: SSRRenderOptions & {
     serverRoutes: ServerRoute[];
 }) => Promise<Response | void>;

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

@@ -1,3 +1,3 @@
-import type { ServerPlugin } from '../../types';
-export * from './inject';
+import type { ServerPlugin } from '../../types/index.js';
+export * from './inject.js';
 export declare const renderPlugin: () => ServerPlugin;

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

@@ -1,7 +1,7 @@
-import type { CacheConfig, GetRenderHandlerOptions, Render, ServerPlugin } from '../../types';
+import type { CacheConfig, GetRenderHandlerOptions, Render, ServerPlugin } from '../../types/index.js';
 export interface InjectRenderHandlerOptions {
     staticGenerate?: boolean;
     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,15 +1,14 @@
 import type { ServerRoute } from '@modern-js/types';
 import type { Router } from 'hono/router';
-import type { CacheConfig, OnFallback, UserConfig } from '../../types';
-import type { Render } from '../../types';
-import type { Params } from '../../types/requestHandler';
+import type { CacheConfig, UserConfig } from '../../types/index.js';
+import type { Render } from '../../types/index.js';
+import type { Params } from '../../types/requestHandler.js';
 interface CreateRenderOptions {
     pwd: string;
     routes: ServerRoute[];
     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/plugins/render/renderRscHandler.d.ts

@@ -1,2 +1,2 @@
-import type { SSRRenderOptions } from './ssrRender';
+import type { SSRRenderOptions } from './ssrRender.js';
 export declare const renderRscHandler: (req: Request, options: SSRRenderOptions) => Promise<Response>;

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

@@ -1,2 +1,2 @@
-import type { SSRRenderOptions } from './ssrRender';
+import type { SSRRenderOptions } from './ssrRender.js';
 export declare const serverActionHandler: (req: Request, { serverManifest, routeInfo, rscClientManifest }: SSRRenderOptions) => Promise<Response>;

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

@@ -1,6 +1,6 @@
 import type { CacheControl, CacheOption, Container } from '@modern-js/types';
 import type { NodeRequest } from '@modern-js/types/server';
-import type { RequestHandler, RequestHandlerOptions } from '../../types/requestHandler';
+import type { RequestHandler, RequestHandlerOptions } from '../../types/requestHandler.js';
 export type CacheStatus = 'hit' | 'stale' | 'expired' | 'miss';
 type MaybeAsync<T> = Promise<T> | T;
 /**

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

@@ -1,8 +1,8 @@
 import type { Reporter, ServerRoute } from '@modern-js/types';
 import type { Monitors, ClientManifest as RscClientManifest, SSRManifest as RscSSRManifest, ServerManifest as RscServerManifest } from '@modern-js/types/server';
 import type { NodeRequest } from '@modern-js/types/server';
-import type { CacheConfig, ServerManifest, UserConfig } from '../../types';
-import type { OnError, OnTiming, Params } from '../../types/requestHandler';
+import type { CacheConfig, ServerManifest, UserConfig } from '../../types/index.js';
+import type { OnError, OnTiming, Params } from '../../types/requestHandler.js';
 export interface SSRRenderOptions {
     pwd: string;
     html: string;

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

@@ -1,3 +1,3 @@
-import type { UserConfig } from '../../types';
-import type { RequestHandlerConfig } from '../../types/requestHandler';
+import type { UserConfig } from '../../types/index.js';
+import type { RequestHandlerConfig } from '../../types/requestHandler.js';
 export declare function createRequestHandlerConfig(userConfig: UserConfig): RequestHandlerConfig;

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

@@ -1,2 +1,2 @@
-import type { ServerPlugin } from '../types';
+import type { ServerPlugin } from '../types/index.js';
 export declare const injectRoutePlugin: () => ServerPlugin;

package/dist/types/serverBase.d.ts

@@ -1,6 +1,6 @@
 import { type ServerCreateOptions } from '@modern-js/plugin/server';
-import type { Env, ServerConfig, ServerPlugin, ServerPluginHooks } from './types';
-import type { CliConfig } from './types/config';
+import type { Env, ServerConfig, ServerPlugin, ServerPluginHooks } from './types/index.js';
+import type { CliConfig } from './types/config/index.js';
 export interface ServerBaseOptions extends ServerCreateOptions {
     /** server working directory, and then also dist directory */
     config: CliConfig;

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

@@ -1,17 +1,17 @@
-import type { BffNormalizedConfig, BffUserConfig } from './bff';
-import type { DevNormalizedConfig, DevUserConfig } from './dev';
-import type { HtmlNormalizedConfig, HtmlUserConfig } from './html';
-import type { OutputNormalizedConfig, OutputUserConfig } from './output';
-import type { SecurityNormalizedConfig, SecurityUserConfig } from './security';
-import type { ServerNormalizedConfig, ServerUserConfig } from './server';
-import type { SourceNormalizedConfig, SourceUserConfig } from './source';
-import type { ToolsNormalizedConfig, ToolsUserConfig } from './tools';
-export * from './bff';
-export * from './html';
-export * from './output';
-export * from './server';
-export * from './source';
-export * from './tools';
+import type { BffNormalizedConfig, BffUserConfig } from './bff.js';
+import type { DevNormalizedConfig, DevUserConfig } from './dev.js';
+import type { HtmlNormalizedConfig, HtmlUserConfig } from './html.js';
+import type { OutputNormalizedConfig, OutputUserConfig } from './output.js';
+import type { SecurityNormalizedConfig, SecurityUserConfig } from './security.js';
+import type { ServerNormalizedConfig, ServerUserConfig } from './server.js';
+import type { SourceNormalizedConfig, SourceUserConfig } from './source.js';
+import type { ToolsNormalizedConfig, ToolsUserConfig } from './tools.js';
+export * from './bff.js';
+export * from './html.js';
+export * from './output.js';
+export * from './server.js';
+export * from './source.js';
+export * from './tools.js';
 export interface UserConfig {
     output?: OutputUserConfig;
     source?: SourceUserConfig;

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

@@ -1,5 +1,5 @@
 import type { Alias } from '@modern-js/utils';
-import type { ConfigChain } from './share';
+import type { ConfigChain } from './share.js';
 export interface SourceUserConfig {
     alias?: ConfigChain<Alias>;
     enableAsyncEntry?: boolean;

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

@@ -1,4 +1,4 @@
-export * from './config';
-export * from './plugins';
-export * from './render';
-export * from './server';
+export * from './config/index.js';
+export * from './plugins/index.js';
+export * from './render.js';
+export * from './server.js';

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';
+import type { UserConfig } from '../config/index.js';
+import type { Render } from '../render.js';
+import type { ServerPlugin } from './plugin.js';
 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 * from './plugin.js';
+export type { ServerConfig, CacheConfig, GetRenderHandlerOptions, FileChangeEvent, WebServerStartInput, APIServerStartInput, ServerMiddleware, MiddlewareObj, } from './base.js';

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 { MiddlewareObj } from './base.js';
+import type { APIServerStartInput, ServerConfig, WebAdapter, WebServerStartInput } from './base.js';
 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/dist/types/types/render.d.ts

@@ -1,6 +1,6 @@
 import type { Monitors, Reporter, ClientManifest as RscClientManifest, SSRManifest as RscSSRManifest, ServerManifest as RscServerManifest } from '@modern-js/types';
 import type { NodeRequest } from '@modern-js/types/server';
-import type { ServerManifest } from './server';
+import type { ServerManifest } from './server.js';
 export interface RenderOptions {
     monitors: Monitors;
     loaderContext?: Map<string, unknown>;

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

@@ -1,6 +1,6 @@
 import type { Reporter, ServerRoute } from '@modern-js/types';
 import type { Monitors, ClientManifest as RscClientManifest, SSRManifest as RscSSRManifest, ServerManifest as RscServerManifest } from '@modern-js/types/server';
-import type { ServerUserConfig, SourceUserConfig } from './config';
+import type { ServerUserConfig, SourceUserConfig } from './config/index.js';
 export type Resource = {
     loadableStats: Record<string, any>;
     routeManifest: Record<string, any>;

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

@@ -1,6 +1,6 @@
 import type { Logger, Metrics, Monitors, NestedRoute, Reporter, ServerRoute } from '@modern-js/types';
 import type { ClientManifest as RscClientManifest, SSRManifest as RscSSRManifest, ServerManifest as RscServerManifest } from '@modern-js/types/server';
-import type { RequestHandler as BundleRequestHandler, OnError, OnTiming, RequestHandlerOptions, Resource } from './requestHandler';
+import type { RequestHandler as BundleRequestHandler, OnError, OnTiming, RequestHandlerOptions, Resource } from './requestHandler.js';
 export type RequestHandler = (request: Request, ...args: any[]) => Response | Promise<Response>;
 export type ServerLoaderBundle = {
     routes: NestedRoute[];

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

@@ -1,9 +1,9 @@
-export * from './env';
-export * from './transformStream';
-export * from './middlewareCollector';
-export * from './error';
-export * from './warmup';
-export * from './entry';
-export * from './request';
-export * from './serverConfig';
-export * from './publicDir';
+export * from './env.js';
+export * from './transformStream.js';
+export * from './middlewareCollector.js';
+export * from './error.js';
+export * from './warmup.js';
+export * from './entry.js';
+export * from './request.js';
+export * from './serverConfig.js';
+export * from './publicDir.js';

package/dist/types/utils/publicDir.d.ts

@@ -1,4 +1,4 @@
-import type { ServerNormalizedConfig } from '../types';
+import type { ServerNormalizedConfig } from '../types/index.js';
 /**
  * Normalize publicDir configuration to an array of strings
  * @param publicDir - publicDir configuration (string | string[] | undefined)

package/dist/types/utils/serverConfig.d.ts

@@ -1,4 +1,4 @@
-import type { CliConfig, ServerConfig } from '../types';
+import type { CliConfig, ServerConfig } from '../types/index.js';
 /**
  * 对配置进行合并，cliConfig 与 serverConfig 进行深合并
  */

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.8.3",
+  "version": "3.9.1",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -71,19 +71,19 @@
     "flatted": "^3.4.4",
     "hono": "^4.11.7",
     "ts-deepmerge": "7.0.3",
-    "@modern-js/plugin": "3.8.3",
-    "@modern-js/runtime-utils": "3.8.3",
-    "@modern-js/utils": "3.8.3"
+    "@modern-js/plugin": "3.9.1",
+    "@modern-js/runtime-utils": "3.9.1",
+    "@modern-js/utils": "3.9.1"
   },
   "devDependencies": {
-    "@rslib/core": "0.23.2",
+    "@rslib/core": "1.0.0",
     "@types/cloneable-readable": "^2.0.3",
     "@types/merge-deep": "^3.0.3",
     "@types/node": "^20",
     "http-proxy-middleware": "^2.0.10",
     "typescript": "^5",
     "@modern-js/rslib": "2.68.10",
-    "@modern-js/types": "3.8.3",
+    "@modern-js/types": "3.9.1",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,