@modern-js/runtime 2.69.5 → 3.0.0-alpha.0

package/dist/esm-node/router/runtime/plugin.node.mjs

@@ -0,0 +1,138 @@
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { merge } from "@modern-js/runtime-utils/merge";
+import { createRequestContext } from "@modern-js/runtime-utils/node";
+import { StaticRouterProvider, createRoutesFromElements, createStaticHandler, createStaticRouter } from "@modern-js/runtime-utils/router";
+import { time } from "@modern-js/runtime-utils/time";
+import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
+import { useContext } from "react";
+import { JSX_SHELL_STREAM_END_MARK } from "../../common.mjs";
+import { InternalRuntimeContext, getGlobalEnableRsc, getGlobalLayoutApp, getGlobalRoutes } from "../../core/context/index.mjs";
+import { setServerPayload } from "../../core/context/serverPayload/index.server.mjs";
+import DeferredDataScripts_node from "./DeferredDataScripts.node.mjs";
+import { modifyRoutes, onBeforeCreateRoutes } from "./hooks.mjs";
+import { RSCStaticRouter, createServerPayload, handleRSCRedirect, prepareRSCRoutes } from "./rsc-router.mjs";
+import { createRouteObjectsFromConfig, renderRoutes, urlJoin } from "./utils.mjs";
+function createRemixReuqest(request) {
+    const method = 'GET';
+    const { headers } = request;
+    const controller = new AbortController();
+    return new Request(request.url, {
+        method,
+        headers,
+        signal: controller.signal
+    });
+}
+const routerPlugin = (userConfig = {})=>({
+        name: '@modern-js/plugin-router',
+        registryHooks: {
+            modifyRoutes: modifyRoutes,
+            onBeforeCreateRoutes: onBeforeCreateRoutes
+        },
+        setup: (api)=>{
+            let finalRouteConfig = {};
+            api.onBeforeRender(async (context, interrupt)=>{
+                const pluginConfig = api.getRuntimeConfig();
+                const { basename = '', routesConfig, createRoutes } = merge(pluginConfig.router || {}, userConfig);
+                finalRouteConfig = {
+                    routes: getGlobalRoutes(),
+                    globalApp: getGlobalLayoutApp(),
+                    ...routesConfig
+                };
+                if (!finalRouteConfig.routes && !createRoutes) return;
+                const enableRsc = getGlobalEnableRsc();
+                if (enableRsc) await prepareRSCRoutes(finalRouteConfig.routes);
+                const { request, mode: ssrMode, nonce, loaderFailureMode = 'errorBoundary', baseUrl } = context.ssrContext;
+                const _basename = '/' === baseUrl ? urlJoin(baseUrl, basename) : baseUrl;
+                const requestContext = createRequestContext(context.ssrContext?.loaderContext);
+                const hooks = api.getHooks();
+                await hooks.onBeforeCreateRoutes.call(context);
+                let routes = [];
+                routes = enableRsc ? createRoutes ? createRoutes() : createRouteObjectsFromConfig({
+                    routesConfig: finalRouteConfig
+                }) : createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
+                    routesConfig: finalRouteConfig,
+                    ssrMode,
+                    props: {
+                        nonce
+                    }
+                }));
+                routes = hooks.modifyRoutes.call(routes);
+                const { query } = createStaticHandler(routes, {
+                    basename: _basename
+                });
+                const remixRequest = createRemixReuqest(context.ssrContext.request.raw);
+                const end = time();
+                const routerContext = await query(remixRequest, {
+                    requestContext
+                });
+                const cost = end();
+                context.ssrContext?.onTiming?.(LOADER_REPORTER_NAME, cost);
+                const isRSCNavigation = 'true' === remixRequest.headers.get('x-rsc-tree');
+                if (routerContext instanceof Response) if (enableRsc && isRSCNavigation) return interrupt(handleRSCRedirect(routerContext.headers, _basename, routerContext.status));
+                else return interrupt(routerContext);
+                const errors = Object.values(routerContext.errors || {});
+                if (errors.length > 0 && 'clientRender' === loaderFailureMode) {
+                    routerContext.statusCode = 200;
+                    throw errors[0];
+                }
+                context.routerContext = routerContext;
+                let payload;
+                if (enableRsc) {
+                    if (isRSCNavigation) {
+                        for (const match of routerContext.matches)if (match.route.hasClientLoader) delete routerContext.loaderData[match.route.id];
+                    }
+                    payload = createServerPayload(routerContext, routes);
+                    setServerPayload(payload);
+                }
+                Object.defineProperty(context, 'routes', {
+                    get () {
+                        return routes;
+                    },
+                    enumerable: true
+                });
+            });
+            api.wrapRoot((App)=>{
+                if (!finalRouteConfig) return App;
+                const getRouteApp = ()=>{
+                    const enableRsc = getGlobalEnableRsc();
+                    return (props)=>{
+                        const context = useContext(InternalRuntimeContext);
+                        const { routerContext, ssrContext, routes } = context;
+                        const { nonce, mode, useJsonScript } = ssrContext;
+                        const { basename } = routerContext;
+                        const remixRouter = createStaticRouter(routes, routerContext);
+                        if (enableRsc) return App ? /*#__PURE__*/ jsx(App, {
+                            children: /*#__PURE__*/ jsx(RSCStaticRouter, {
+                                basename: basename
+                            })
+                        }) : /*#__PURE__*/ jsx(RSCStaticRouter, {
+                            basename: basename
+                        });
+                        {
+                            const routerWrapper = /*#__PURE__*/ jsxs(Fragment, {
+                                children: [
+                                    /*#__PURE__*/ jsx(StaticRouterProvider, {
+                                        router: remixRouter,
+                                        context: routerContext,
+                                        hydrate: false
+                                    }),
+                                    'stream' === mode && /*#__PURE__*/ jsx(DeferredDataScripts_node, {
+                                        nonce: nonce,
+                                        context: routerContext,
+                                        useJsonScript: useJsonScript
+                                    }),
+                                    'stream' === mode && JSX_SHELL_STREAM_END_MARK
+                                ]
+                            });
+                            return App ? /*#__PURE__*/ jsx(App, {
+                                children: routerWrapper
+                            }) : routerWrapper;
+                        }
+                    };
+                };
+                return getRouteApp();
+            });
+        }
+    });
+const plugin_node_modifyRoutes = ()=>{};
+export { plugin_node_modifyRoutes as modifyRoutes, routerPlugin };

package/dist/esm-node/router/runtime/routerHelper.mjs

@@ -0,0 +1,15 @@
+import { ROUTE_MODULES } from "@modern-js/utils/universal/constants";
+const createShouldRevalidate = (routeId)=>(arg)=>{
+        const routeModule = window?.[ROUTE_MODULES]?.[routeId];
+        if (routeModule && 'function' == typeof routeModule.shouldRevalidate) return routeModule.shouldRevalidate(arg);
+        return arg.defaultShouldRevalidate;
+    };
+const handleRouteModule = (routeModule, routeId)=>{
+    if ("u" > typeof document) window[ROUTE_MODULES][routeId] = routeModule;
+    return routeModule;
+};
+const handleRouteModuleError = (error)=>{
+    console.error(error);
+    return null;
+};
+export { createShouldRevalidate, handleRouteModule, handleRouteModuleError };

package/dist/esm-node/router/runtime/rsc-router.mjs

@@ -0,0 +1,233 @@
+import { Fragment, jsx } from "react/jsx-runtime";
+import { ElementsContext, createFromReadableStream } from "@modern-js/render/client";
+import { StaticRouterProvider, createBrowserRouter, createStaticRouter, redirect } from "@modern-js/runtime-utils/router";
+import react from "react";
+const safeUse = (promise)=>{
+    if ('function' == typeof react.use) return react.use(promise);
+    return null;
+};
+const createServerPayload = (routerContext, routes)=>({
+        type: 'render',
+        actionData: routerContext.actionData,
+        errors: routerContext.errors,
+        loaderData: routerContext.loaderData,
+        location: routerContext.location,
+        routes: routerContext.matches.map((match, index, matches)=>{
+            const element = match.route.element;
+            const parentMatch = index > 0 ? matches[index - 1] : void 0;
+            let processedElement;
+            if (element) {
+                const ElementComponent = element.type;
+                processedElement = /*#__PURE__*/ react.createElement(ElementComponent, {
+                    loaderData: routerContext?.loaderData?.[match.route.id],
+                    actionData: routerContext?.actionData?.[match.route.id],
+                    params: match.params,
+                    matches: routerContext.matches.map((m)=>{
+                        const { route, pathname, params } = m;
+                        return {
+                            id: route.id,
+                            pathname,
+                            params,
+                            data: routerContext?.loaderData?.[route.id],
+                            handle: route.handle
+                        };
+                    })
+                });
+            }
+            return {
+                element: processedElement,
+                errorElement: match.route.errorElement,
+                handle: match.route.handle,
+                hasAction: !!match.route.action,
+                hasErrorBoundary: !!match.route.hasErrorBoundary,
+                hasLoader: !!match.route.loader,
+                hasClientLoader: !!match.route.hasClientLoader,
+                id: match.route.id,
+                index: match.route.index,
+                params: match.params,
+                parentId: parentMatch?.route.id || match.route.parentId,
+                path: match.route.path,
+                pathname: match.pathname,
+                pathnameBase: match.pathnameBase
+            };
+        })
+    });
+const handleRSCRedirect = (headers, basename, status)=>{
+    const newHeaders = new Headers(headers);
+    let redirectUrl = headers.get('Location');
+    if ('/' !== basename) redirectUrl = redirectUrl.replace(basename, '');
+    newHeaders.set('X-Modernjs-Redirect', redirectUrl);
+    newHeaders.set('X-Modernjs-BaseUrl', basename);
+    newHeaders.delete('Location');
+    return new Response(null, {
+        status: status,
+        headers: newHeaders
+    });
+};
+const prepareRSCRoutes = async (routes)=>{
+    const isLazyComponent = (component)=>component && 'object' == typeof component && void 0 !== component._init && void 0 !== component._payload;
+    const processRoutes = async (routesList)=>{
+        await Promise.all(routesList.map(async (route)=>{
+            if ('lazyImport' in route && isLazyComponent(route.component)) route.component = (await route.lazyImport()).default;
+            if (route.children && Array.isArray(route.children)) await processRoutes(route.children);
+        }));
+    };
+    await processRoutes(routes);
+};
+const mergeRoutes = (routes, originalRoutes)=>{
+    if (!originalRoutes || !Array.isArray(originalRoutes)) return routes;
+    const routesMap = new Map();
+    const buildRoutesMap = (routesList)=>{
+        routesList.forEach((route)=>{
+            if (route.id) routesMap.set(route.id, route);
+            if ('children' in route && route.children && Array.isArray(route.children)) buildRoutesMap(route.children);
+        });
+    };
+    buildRoutesMap(routes);
+    const mergeRoutesRecursive = (origRoutes)=>origRoutes.map((origRoute)=>{
+            if (origRoute.id && routesMap.has(origRoute.id)) {
+                const matchedRoute = routesMap.get(origRoute.id);
+                const result = {
+                    loader: origRoute.hasClientLoader ? origRoute.loader : void 0,
+                    ...matchedRoute
+                };
+                if (origRoute.children && Array.isArray(origRoute.children)) result.children = mergeRoutesRecursive(origRoute.children);
+                return result;
+            }
+            return origRoute;
+        });
+    return mergeRoutesRecursive(originalRoutes);
+};
+const findRouteInTree = (routes, routeId)=>{
+    for (const route of routes){
+        if (route.id === routeId) return route;
+        if (route.children && Array.isArray(route.children)) {
+            const found = findRouteInTree(route.children, routeId);
+            if (found) return found;
+        }
+    }
+    return null;
+};
+const createClientRouterFromPayload = (payload, originalRoutes, basename = '')=>{
+    const processedRoutes = payload.routes.reduceRight((previous, route)=>{
+        if (previous.length > 0) return [
+            {
+                ...route,
+                children: previous
+            }
+        ];
+        return [
+            route
+        ];
+    }, []);
+    const mergedRoutes = mergeRoutes(processedRoutes, originalRoutes);
+    const router = createBrowserRouter(mergedRoutes, {
+        hydrationData: payload,
+        basename: basename,
+        dataStrategy: async (context)=>{
+            const { request, matches } = context;
+            const results = {};
+            const clientMatches = matches.filter((match)=>match.route.hasClientLoader);
+            const fetchPromise = fetch(request.url, {
+                headers: {
+                    'x-rsc-tree': 'true'
+                }
+            });
+            const clientLoadersPromise = clientMatches.length > 0 ? Promise.all(clientMatches.map(async (clientMatch)=>{
+                const foundRoute = findRouteInTree(originalRoutes, clientMatch.route.id);
+                clientMatch.route.loader = foundRoute?.loader;
+                const res = await clientMatch.resolve();
+                return {
+                    routeId: clientMatch.route.id,
+                    result: res
+                };
+            })) : Promise.resolve([]);
+            const res = await fetchPromise;
+            const redirectLocation = res.headers.get('X-Modernjs-Redirect');
+            if (redirectLocation) {
+                matches.forEach((match)=>{
+                    const routeId = match.route.id;
+                    if (routeId) results[routeId] = {
+                        type: 'redirect',
+                        result: redirect(redirectLocation)
+                    };
+                });
+                return results;
+            }
+            const [clientLoaderResults] = await Promise.all([
+                clientLoadersPromise
+            ]);
+            clientLoaderResults.forEach(({ routeId, result })=>{
+                results[routeId] = result;
+            });
+            const payload = await createFromReadableStream(res.body);
+            if (void 0 === payload.type || 'render' !== payload.type) throw new Error('Unexpected payload type');
+            matches.forEach((match)=>{
+                const routeId = match.route.id;
+                const matchedRoute = payload.routes.find((route)=>route.id === routeId);
+                if (matchedRoute) router.patchRoutes(matchedRoute.parentId, [
+                    matchedRoute
+                ], true);
+                if (payload.loaderData?.[routeId]) results[routeId] = {
+                    type: 'data',
+                    result: payload.loaderData[routeId]
+                };
+            });
+            return results;
+        }
+    });
+    return router;
+};
+const createRSCStaticRouterComponent = (payload, basename)=>{
+    const routerContext = {
+        actionData: payload.actionData,
+        actionHeaders: {},
+        activeDeferreds: {},
+        basename: basename || '',
+        errors: payload.errors,
+        loaderData: payload.loaderData,
+        loaderHeaders: {},
+        location: payload.location,
+        statusCode: 200,
+        matches: payload.routes.map((match)=>({
+                params: match.params,
+                pathname: match.pathname,
+                pathnameBase: match.pathnameBase,
+                route: {
+                    id: match.id,
+                    action: match.hasAction || !!match.clientAction,
+                    handle: match.handle,
+                    hasErrorBoundary: match.hasErrorBoundary,
+                    loader: match.hasLoader || !!match.clientLoader,
+                    index: match.index,
+                    path: match.path,
+                    shouldRevalidate: match.shouldRevalidate
+                }
+            }))
+    };
+    const processedRoutes = payload.routes.reduceRight((previous, route)=>{
+        if (previous.length > 0) return [
+            {
+                ...route,
+                children: previous
+            }
+        ];
+        return [
+            route
+        ];
+    }, []);
+    const router = createStaticRouter(processedRoutes, routerContext);
+    return /*#__PURE__*/ jsx(StaticRouterProvider, {
+        context: routerContext,
+        router: router,
+        hydrate: false
+    });
+};
+const RSCStaticRouter = ({ basename })=>{
+    const payload = safeUse(safeUse(ElementsContext));
+    if (!payload || 'render' !== payload.type) return null;
+    return /*#__PURE__*/ jsx(Fragment, {
+        children: createRSCStaticRouterComponent(payload, basename)
+    });
+};
+export { RSCStaticRouter, createClientRouterFromPayload, createServerPayload, handleRSCRedirect, prepareRSCRoutes };

package/dist/esm-node/router/runtime/rsc.mjs

@@ -0,0 +1 @@
+export * from "@modern-js/runtime-utils/router/rsc";

package/dist/esm-node/router/runtime/server.mjs

@@ -0,0 +1 @@
+export * from "@modern-js/runtime-utils/router";

package/dist/esm-node/router/runtime/utils.mjs

@@ -0,0 +1,165 @@
+import { jsx } from "react/jsx-runtime";
+import { renderNestedRoute } from "@modern-js/runtime-utils/browser";
+import { Route, UNSAFE_ErrorResponseImpl, isRouteErrorResponse } from "@modern-js/runtime-utils/router";
+import react from "react";
+import { DefaultNotFound } from "./DefaultNotFound.mjs";
+import DeferredDataScripts from "./DeferredDataScripts.mjs";
+function getRouteComponents(routes, { globalApp, ssrMode, props }) {
+    const Layout = ({ Component, ...props })=>{
+        const GlobalLayout = globalApp;
+        if (!GlobalLayout) return /*#__PURE__*/ jsx(Component, {
+            ...props
+        });
+        return /*#__PURE__*/ jsx(GlobalLayout, {
+            Component: Component,
+            ...props
+        });
+    };
+    const routeElements = [];
+    for (const route of routes)if ('nested' === route.type) {
+        const routeElement = renderNestedRoute(route, {
+            DeferredDataComponent: 'stream' === ssrMode ? DeferredDataScripts : void 0,
+            props
+        });
+        routeElements.push(routeElement);
+    } else {
+        const routeElement = /*#__PURE__*/ jsx(Route, {
+            path: route.path,
+            element: /*#__PURE__*/ jsx(Layout, {
+                Component: route.component
+            })
+        }, route.path);
+        routeElements.push(routeElement);
+    }
+    routeElements.push(/*#__PURE__*/ jsx(Route, {
+        path: "*",
+        element: /*#__PURE__*/ jsx(DefaultNotFound, {}),
+        loader: ()=>new Response('404', {
+                status: 404
+            })
+    }, "*"));
+    return routeElements;
+}
+function getRouteObjects(routes, { globalApp, ssrMode, props }) {
+    const createLayoutElement = (Component)=>{
+        const GlobalLayout = globalApp;
+        if (!GlobalLayout) return Component;
+        const LayoutWrapper = (props)=>{
+            const LayoutComponent = GlobalLayout;
+            return /*#__PURE__*/ jsx(LayoutComponent, {
+                Component: Component,
+                ...props
+            });
+        };
+        return LayoutWrapper;
+    };
+    const routeObjects = [];
+    for (const route of routes)if ('nested' === route.type) {
+        const nestedRouteObject = {
+            path: route.path,
+            id: route.id,
+            loader: route.loader,
+            action: route.action,
+            hasErrorBoundary: route.hasErrorBoundary,
+            shouldRevalidate: route.shouldRevalidate,
+            handle: {
+                ...route.handle,
+                ...'object' == typeof route.config ? route.config?.handle : {}
+            },
+            index: route.index,
+            hasClientLoader: !!route.clientData,
+            Component: route.component ? route.component : void 0,
+            errorElement: route.error ? /*#__PURE__*/ jsx(route.error, {}) : void 0,
+            children: route.children ? route.children.map((child)=>getRouteObjects([
+                    child
+                ], {
+                    globalApp,
+                    ssrMode,
+                    props
+                })[0]) : void 0
+        };
+        routeObjects.push(nestedRouteObject);
+    } else if ('function' == typeof route.component || 'object' == typeof route.component) {
+        const LayoutComponent = createLayoutElement(route.component);
+        const routeObject = {
+            path: route.path,
+            element: /*#__PURE__*/ react.createElement(LayoutComponent)
+        };
+        routeObjects.push(routeObject);
+    }
+    routeObjects.push({
+        path: '*',
+        element: /*#__PURE__*/ jsx(DefaultNotFound, {})
+    });
+    return routeObjects;
+}
+function createRouteObjectsFromConfig({ routesConfig, props, ssrMode }) {
+    if (!routesConfig) return null;
+    const { routes, globalApp } = routesConfig;
+    if (!routes) return null;
+    return getRouteObjects(routes, {
+        globalApp,
+        ssrMode,
+        props
+    });
+}
+function renderRoutes({ routesConfig, props, ssrMode }) {
+    if (!routesConfig) return null;
+    const { routes, globalApp } = routesConfig;
+    if (!routes) return null;
+    const routeElements = getRouteComponents(routes, {
+        globalApp,
+        ssrMode,
+        props
+    });
+    return routeElements;
+}
+function getLocation(serverContext) {
+    const { pathname = '', url = '' } = serverContext?.request || {};
+    const cleanUrl = url?.replace('http://', '')?.replace('https://', '');
+    const index = (cleanUrl || '').indexOf(pathname);
+    if (-1 === index) return pathname;
+    return cleanUrl.substring(index);
+}
+const urlJoin = (...parts)=>{
+    const separator = '/';
+    const replace = new RegExp(`${separator}{1,}`, 'g');
+    return standardSlash(parts.join(separator).replace(replace, separator));
+};
+function standardSlash(str) {
+    let addr = str;
+    if (!addr || 'string' != typeof addr) return addr;
+    if (addr.startsWith('.')) addr = addr.slice(1);
+    if (!addr.startsWith('/')) addr = `/${addr}`;
+    if (addr.endsWith('/') && '/' !== addr) addr = addr.slice(0, addr.length - 1);
+    return addr;
+}
+function serializeErrors(errors) {
+    if (!errors) return null;
+    const entries = Object.entries(errors);
+    const serialized = {};
+    for (const [key, val] of entries)if (isRouteErrorResponse(val)) serialized[key] = {
+        ...val,
+        __type: 'RouteErrorResponse'
+    };
+    else if (val instanceof Error) serialized[key] = {
+        message: val.message,
+        stack: val.stack,
+        __type: 'Error'
+    };
+    else serialized[key] = val;
+    return serialized;
+}
+function deserializeErrors(errors) {
+    if (!errors) return null;
+    const entries = Object.entries(errors);
+    const serialized = {};
+    for (const [key, val] of entries)if (val && 'RouteErrorResponse' === val.__type) serialized[key] = new UNSAFE_ErrorResponseImpl(val.status, val.statusText, val.data, true === val.internal);
+    else if (val && 'Error' === val.__type) {
+        const error = new Error(val.message);
+        error.stack = val.stack;
+        serialized[key] = error;
+    } else serialized[key] = val;
+    return serialized;
+}
+export { createRouteObjectsFromConfig, deserializeErrors, getLocation, getRouteComponents, getRouteObjects, renderRoutes, serializeErrors, standardSlash, urlJoin };

package/dist/esm-node/router/runtime/withRouter.mjs

@@ -0,0 +1,14 @@
+import { jsx } from "react/jsx-runtime";
+import { useLocation, useNavigate, useParams } from "@modern-js/runtime-utils/router";
+const withRouter = (Component)=>(props)=>{
+        const location = useLocation();
+        const params = useParams();
+        const navigate = useNavigate();
+        return /*#__PURE__*/ jsx(Component, {
+            ...props,
+            location: location,
+            params: params,
+            navigate: navigate
+        });
+    };
+export { withRouter };

package/dist/esm-node/rsc/client.mjs

@@ -0,0 +1,3 @@
+export * from "@modern-js/render/client";
+const isRedirectResponse = (res)=>null != res.headers.get('X-Modernjs-Redirect');
+export { isRedirectResponse };

package/dist/esm-node/rsc/server.mjs

@@ -0,0 +1,33 @@
+export * from "@modern-js/render/rsc";
+async function processRSCStream(rscStream, controller, encoder) {
+    try {
+        const reader = rscStream.getReader();
+        const decoder = new TextDecoder('utf-8', {
+            fatal: true
+        });
+        while(true){
+            const { done, value } = await reader.read();
+            if (done) break;
+            try {
+                const chunk = JSON.stringify(decoder.decode(value, {
+                    stream: true
+                }));
+                const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${chunk})</script>`;
+                controller.enqueue(encoder.encode(scriptTag));
+            } catch (err) {
+                const base64 = JSON.stringify(btoa(String.fromCodePoint(...value)));
+                const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(Uint8Array.from(atob(${base64}), m => m.codePointAt(0)))</script>`;
+                controller.enqueue(encoder.encode(scriptTag));
+            }
+        }
+        const remaining = decoder.decode();
+        if (remaining.length) {
+            const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${JSON.stringify(remaining)})</script>`;
+            controller.enqueue(encoder.encode(scriptTag));
+        }
+        controller.close();
+    } catch (error) {
+        controller.error(error);
+    }
+}
+export { processRSCStream };

package/dist/types/cli/code.d.ts

@@ -1,3 +1,3 @@
 import type { AppToolsContext, AppToolsFeatureHooks, AppToolsNormalizedConfig } from '@modern-js/app-tools';
 import type { Entrypoint } from '@modern-js/types';
-export declare const generateCode: (entrypoints: Entrypoint[], appContext: AppToolsContext<"shared">, config: AppToolsNormalizedConfig, hooks: AppToolsFeatureHooks<"shared">) => Promise<void>;
+export declare const generateCode: (entrypoints: Entrypoint[], appContext: AppToolsContext, config: AppToolsNormalizedConfig, hooks: AppToolsFeatureHooks) => Promise<void>;

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

@@ -1,10 +1,10 @@
-import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
+import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 import { documentPlugin } from '../document/cli';
 import { routerPlugin } from '../router/cli';
 import { ssrPlugin } from './ssr';
 export { isRuntimeEntry } from './entry';
 export { ssrPlugin, routerPlugin, documentPlugin };
 export declare const runtimePlugin: (params?: {
-    plugins?: CliPluginFuture<AppTools<"shared">>[];
-}) => CliPluginFuture<AppTools<"shared">>;
+    plugins?: CliPlugin<AppTools>[];
+}) => CliPlugin<AppTools>;
 export default runtimePlugin;

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

@@ -1,3 +1,3 @@
-import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
-export declare const ssrPlugin: () => CliPluginFuture<AppTools<"shared">>;
+import type { AppTools, CliPlugin } from '@modern-js/app-tools';
+export declare const ssrPlugin: () => CliPlugin<AppTools>;
 export default ssrPlugin;

package/dist/types/cli/ssr/mode.d.ts

@@ -0,0 +1,15 @@
+import type { AppToolsNormalizedConfig } from '@modern-js/app-tools';
+export type SSRMode = 'string' | 'stream' | false;
+/**
+ * Unified SSR mode resolution function.
+ * Priority:
+ * 1. If SSG is enabled, use SSG configuration (SSG takes precedence over SSR when both are configured)
+ * 2. User's explicit server.ssr/server.ssrByEntries config
+ * 3. Otherwise return false (no SSR)
+ */
+export declare function resolveSSRMode(params: {
+    entry?: string;
+    config: AppToolsNormalizedConfig;
+    appDirectory?: string;
+    nestedRoutesEntry?: string;
+}): SSRMode;