@modern-js/server-core 2.56.2 → 2.57.1-alpha.0

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

@@ -117,14 +117,35 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
   };
 }
 async function renderHandler(request, options, mode, onError) {
+  var _options_config_server;
   const serverData = {
     router: {
       baseUrl: options.routeInfo.urlPath,
       params: options.params
     }
   };
-  let response;
-  if (mode === "ssr") {
+  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 { nestedRoutesJson } = serverManifest;
+    const routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
+    if (routes) {
+      const { matchRoutes } = await import("@modern-js/runtime-utils/remix-router");
+      const url = new URL(request.url);
+      const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
+      if (!matchedRoutes) {
+        response = csrRender(options.html);
+      } else {
+        var _lastMatch_route;
+        const lastMatch = matchedRoutes[matchedRoutes.length - 1];
+        if (!(lastMatch === null || lastMatch === void 0 ? void 0 : (_lastMatch_route = lastMatch.route) === null || _lastMatch_route === void 0 ? void 0 : _lastMatch_route.id) || !ssrByRouteIds.includes(lastMatch.route.id)) {
+          response = csrRender(options.html);
+        }
+      }
+    }
+  }
+  if (mode === "ssr" && !response) {
     try {
       response = await ssrRender(request, options);
     } catch (e) {

package/dist/types/{plugins/customServer/loader.d.ts → helper.d.ts}

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

package/dist/types/index.d.ts

@@ -4,6 +4,7 @@ export type { ServerBase, ServerBaseOptions } from './serverBase';
 export { createServerBase } from './serverBase';
 export { PluginManager, type PluginManagerOptions } from './pluginManager';
 export type { Middleware, Context, Next, HonoRequest as InternalRequest, ServerEnv, ServerManifest, } from './types';
+export { getLoaderCtx } from './helper';
 export * from './plugins';
 export * from './types/plugin';
 export * from './types/render';

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

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

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

@@ -0,0 +1,7 @@
+import { Logger } from '@modern-js/types';
+import type { ServerPlugin } from '../types';
+import { InjectRenderHandlerOptions } from './render';
+export type CreateDefaultPluginsOptions = InjectRenderHandlerOptions & {
+    logger?: Logger;
+};
+export declare function createDefaultPlugins(options?: CreateDefaultPluginsOptions): ServerPlugin[];

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

@@ -1,6 +1,6 @@
-export { renderPlugin, getRenderHandler, type RenderPluginOptions, type GetRenderHandlerOptions, } from './render';
+export { renderPlugin, injectRenderHandlerPlugin, type InjectRenderHandlerOptions, getRenderHandler, } from './render';
 export { faviconPlugin } from './favicon';
+export { injectServerTiming, injectloggerPluigin } from './monitors';
 export { processedByPlugin } from './processedBy';
-export { getLoaderCtx } from './customServer';
 export { logPlugin } from './log';
-export { initMonitorsPlugin, injectServerTiming, injectloggerPluigin, } from './monitors';
+export { createDefaultPlugins, type CreateDefaultPluginsOptions, } from './default';

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

@@ -1,6 +1,6 @@
 import type { Logger } from '@modern-js/types';
 import type { Context, Next, ServerEnv, ServerPlugin } from '../types';
 export declare const initMonitorsPlugin: () => ServerPlugin;
-export declare const injectloggerPluigin: (logger: Logger) => ServerPlugin;
-export declare const injectServerTiming: (metaName?: string) => ServerPlugin;
+export declare const injectloggerPluigin: (inputLogger?: Logger) => ServerPlugin;
+export declare const injectServerTiming: () => ServerPlugin;
 export declare function initReporter(entryName: string): (c: Context<ServerEnv>, next: Next) => Promise<void>;

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

@@ -1,16 +1,3 @@
-import { ServerRoute } from '@modern-js/types';
-import { ServerPlugin, Render, UserConfig, CacheConfig } from '../../types';
-export interface RenderPluginOptions {
-    staticGenerate?: boolean;
-    cacheConfig?: CacheConfig;
-}
-export declare const renderPlugin: (options?: RenderPluginOptions) => ServerPlugin;
-export interface GetRenderHandlerOptions {
-    pwd: string;
-    routes: ServerRoute[];
-    config: UserConfig;
-    cacheConfig?: CacheConfig;
-    staticGenerate?: boolean;
-    metaName?: string;
-}
-export declare function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, }: GetRenderHandlerOptions): Promise<Render>;
+import { ServerPlugin } from '../../types';
+export * from './inject';
+export declare const renderPlugin: () => ServerPlugin;

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

@@ -0,0 +1,7 @@
+import type { CacheConfig, GetRenderHandlerOptions, Render, ServerPlugin } from '../../types';
+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, }: GetRenderHandlerOptions): Promise<Render>;

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

@@ -12,7 +12,6 @@ export interface OutputUserConfig {
     };
     enableInlineRouteManifests?: boolean;
     disableInlineRouteManifests?: boolean;
-    path?: string;
     assetPrefix?: string;
     polyfill?: 'entry' | 'usage' | 'ua' | 'off';
     /**

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

@@ -41,6 +41,10 @@ export type SSR = boolean | {
 export type SSRByEntries = Record<string, SSR>;
 export interface ServerUserConfig {
     routes?: Routes;
+    /**
+     * Experimenal, it is not recommended to use it now
+     */
+    ssrByRouteIds?: string[];
     publicRoutes?: Record<string, string>;
     ssr?: SSR;
     ssrByEntries?: SSRByEntries;

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

@@ -96,10 +96,20 @@ type Middleware = {
     before?: Array<Middleware['name']>;
     order?: MiddlewareOrder;
 };
+export interface GetRenderHandlerOptions {
+    pwd: string;
+    routes: ServerRoute[];
+    config: UserConfig;
+    cacheConfig?: CacheConfig;
+    staticGenerate?: boolean;
+    metaName?: string;
+}
 declare module '@modern-js/types' {
     interface ISAppContext {
         middlewares: Middleware[];
         metaName: string;
+        getRenderOptions?: GetRenderHandlerOptions;
+        render?: Render;
         routes?: ServerRoute[];
         nodeServer?: NodeServer;
     }

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

@@ -28,6 +28,7 @@ export type ServerManifest = {
     renderBundles?: Record<string, ServerRenderBundle>;
     loadableStats?: Record<string, any>;
     routeManifest?: Record<string, any>;
+    nestedRoutesJson?: Record<string, any>;
 };
 type ServerVariables = {
     /** @deprecated  */

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.56.2",
+  "version": "2.57.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -52,9 +52,9 @@
     "@web-std/file": "^3.0.3",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.0",
-    "@modern-js/plugin": "2.56.2",
-    "@modern-js/runtime-utils": "2.56.2",
-    "@modern-js/utils": "2.56.2"
+    "@modern-js/plugin": "2.57.0",
+    "@modern-js/utils": "2.57.0",
+    "@modern-js/runtime-utils": "2.57.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -64,9 +64,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.56.2",
-    "@scripts/build": "2.56.2",
-    "@scripts/jest-config": "2.56.2"
+    "@scripts/build": "2.57.0",
+    "@modern-js/types": "2.57.0",
+    "@scripts/jest-config": "2.57.0"
   },
   "sideEffects": false,
   "publishConfig": {