Merge branch 'main' into renovate/main-rsbuild

Author: caohuilin

packages/cli/plugin-ssg/src/server/index.ts

@@ -120,6 +120,7 @@ export const createServer = async (
           method: 'GET',
           headers: {
             host: 'localhost',
+            'x-modern-ssg-render': 'true',
           },
         });
 

packages/runtime/plugin-runtime/src/cli/code.ts

@@ -1,6 +1,5 @@
 import path from 'path';
 import type {
-  AppNormalizedConfig,
   AppToolsContext,
   AppToolsFeatureHooks,
   AppToolsNormalizedConfig,
@@ -17,34 +16,10 @@ import {
   INDEX_FILE_NAME,
   SERVER_ENTRY_POINT_FILE_NAME,
 } from './constants';
+import { resolveSSRMode } from './ssr/mode';
 import * as template from './template';
 import * as serverTemplate from './template.server';
 
-function getSSRMode(
-  entry: string,
-  config: AppToolsNormalizedConfig,
-): 'string' | 'stream' | false {
-  const { ssr, ssrByEntries } = config.server;
-
-  if (config.output.ssg || config.output.ssgByEntries) {
-    return 'string';
-  }
-
-  return checkSSRMode(ssrByEntries?.[entry] || ssr);
-
-  function checkSSRMode(ssr: AppNormalizedConfig['server']['ssr']) {
-    if (!ssr) {
-      return false;
-    }
-
-    if (typeof ssr === 'boolean') {
-      return ssr ? 'string' : false;
-    }
-
-    return ssr.mode === 'stream' ? 'stream' : 'string';
-  }
-}
-
 export const generateCode = async (
   entrypoints: Entrypoint[],
   appContext: AppToolsContext,
@@ -63,15 +38,25 @@ export const generateCode = async (
   } = appContext;
   await Promise.all(
     entrypoints.map(async entrypoint => {
-      const { entryName, isAutoMount, entry, customEntry, customServerEntry } =
-        entrypoint;
+      const {
+        entryName,
+        isAutoMount,
+        entry,
+        customEntry,
+        customServerEntry,
+        nestedRoutesEntry,
+      } = entrypoint;
       const { plugins: runtimePlugins } =
         await hooks._internalRuntimePlugins.call({
           entrypoint,
           plugins: [],
         });
       if (isAutoMount) {
-        const ssrMode = getSSRMode(entryName, config);
+        const ssrMode = resolveSSRMode({
+          entry: entryName,
+          config,
+          nestedRoutesEntry,
+        });
         let indexCode = '';
         // index.jsx
         if (!ssrMode && config.server.rsc) {

packages/runtime/plugin-runtime/src/cli/ssr/index.ts

@@ -6,8 +6,10 @@ import type {
   ServerUserConfig,
 } from '@modern-js/app-tools';
 import type { CLIPluginAPI } from '@modern-js/plugin';
+import type { Entrypoint } from '@modern-js/types';
 import { LOADABLE_STATS_FILE, isUseSSRBundle } from '@modern-js/utils';
 import type { RsbuildPlugin } from '@rsbuild/core';
+import { resolveSSRMode } from './mode';
 
 const hasStringSSREntry = (userConfig: AppToolsNormalizedConfig): boolean => {
   const isStreaming = (ssr: ServerUserConfig['ssr']) =>
@@ -42,16 +44,32 @@ const hasStringSSREntry = (userConfig: AppToolsNormalizedConfig): boolean => {
   return false;
 };
 
-const checkUseStringSSR = (config: AppToolsNormalizedConfig): boolean => {
-  const { output } = config;
-
-  if (output?.ssg) {
-    return true;
-  }
-  if (output?.ssgByEntries && Object.keys(output.ssgByEntries).length > 0) {
-    return true;
+/**
+ * Check if any entry uses string SSR mode.
+ * Returns true if at least one entry uses 'string' SSR mode.
+ */
+const checkUseStringSSR = (
+  config: AppToolsNormalizedConfig,
+  appDirectory?: string,
+  entrypoints?: Entrypoint[],
+): boolean => {
+  // If entrypoints are provided, check each entry
+  if (entrypoints && entrypoints.length > 0) {
+    for (const entrypoint of entrypoints) {
+      const ssrMode = resolveSSRMode({
+        entry: entrypoint.entryName,
+        config,
+        appDirectory,
+        nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+      });
+      if (ssrMode === 'string') {
+        return true;
+      }
+    }
+    return false;
   }
-  return hasStringSSREntry(config);
+
+  return true;
 };
 
 const ssrBuilderPlugin = (
@@ -72,10 +90,13 @@ const ssrBuilderPlugin = (
           ? 'edge'
           : 'node';
 
+      const appContext = modernAPI.getAppContext();
+      const { appDirectory, entrypoints } = appContext;
+
       const useLoadablePlugin =
         isUseSSRBundle(userConfig) &&
         !isServerEnvironment &&
-        checkUseStringSSR(userConfig);
+        checkUseStringSSR(userConfig, appDirectory, entrypoints);
 
       return mergeEnvironmentConfig(config, {
         source: {

packages/runtime/plugin-runtime/src/cli/ssr/mode.ts

@@ -0,0 +1,61 @@
+import type {
+  AppNormalizedConfig,
+  AppToolsNormalizedConfig,
+} from '@modern-js/app-tools';
+import { isReact18, isUseRsc } from '@modern-js/utils';
+
+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 function resolveSSRMode(params: {
+  entry?: string;
+  config: AppToolsNormalizedConfig;
+  appDirectory?: string;
+  nestedRoutesEntry?: string;
+}): SSRMode {
+  const { entry, config, appDirectory, nestedRoutesEntry } = params;
+
+  // 1. Check if SSG is enabled first (SSG takes precedence over SSR when both are configured)
+  const isSsgEnabled =
+    config.output?.ssg ||
+    (config.output?.ssgByEntries &&
+      (entry
+        ? !!config.output.ssgByEntries[entry]
+        : Object.keys(config.output.ssgByEntries).length > 0));
+
+  if (isSsgEnabled) {
+    if (nestedRoutesEntry) {
+      return 'stream';
+    } else {
+      return 'string';
+    }
+    if (appDirectory) {
+      return isReact18(appDirectory) ? 'stream' : 'string';
+    }
+    return 'stream';
+  }
+
+  // 2. Check user's explicit SSR config (server.ssr or server.ssrByEntries)
+  const ssr = entry
+    ? config.server?.ssrByEntries?.[entry] || config.server?.ssr
+    : config.server?.ssr;
+
+  if (ssr !== undefined) {
+    if (!ssr) {
+      return false;
+    }
+    if (typeof ssr === 'boolean') {
+      return ssr ? 'string' : false;
+    }
+    return ssr.mode === 'stream' ? 'stream' : 'string';
+  }
+
+  // 3. No SSR
+  return false;
+}

packages/runtime/plugin-runtime/src/core/server/requestHandler.tsx

@@ -10,7 +10,7 @@ import {
   parseHeaders,
   parseQuery,
 } from '@modern-js/runtime-utils/universal/request';
-import type React from 'react';
+import React from 'react';
 import { Fragment } from 'react';
 import {
   type TInternalRuntimeContext,
@@ -141,7 +141,13 @@ function createSSRContext(
     config.ssr,
     config.ssrByEntries,
   );
-  const ssrMode = getSSRMode(ssrConfig);
+  let ssrMode = getSSRMode(ssrConfig);
+
+  const isSsgRender = headers.get('x-modern-ssg-render') === 'true';
+  if (isSsgRender) {
+    const reactMajor = Number((React.version || '0').split('.')[0]);
+    ssrMode = reactMajor >= 18 ? 'stream' : 'string';
+  }
 
   const loaderFailureMode =
     typeof ssrConfig === 'object' ? ssrConfig.loaderFailureMode : undefined;

packages/runtime/plugin-runtime/src/core/server/stream/createReadableStream.ts

@@ -36,7 +36,11 @@ export const createReadableStreamFromElement: CreateReadableStreamFromElement =
     // When a crawler visit the page, we should waiting for entrie content of page
 
     const isbot = checkIsBot(request.headers.get('user-agent'));
-    const onReady = isbot || forceStream2String ? 'onAllReady' : 'onShellReady';
+    const isSsgRender = request.headers.get('x-modern-ssg-render') === 'true';
+    const onReady =
+      isbot || isSsgRender || forceStream2String
+        ? 'onAllReady'
+        : 'onShellReady';
 
     const internalRuntimeContext = getGlobalInternalRuntimeContext();
     const hooks = internalRuntimeContext.hooks;

packages/runtime/plugin-runtime/src/core/server/stream/createReadableStream.worker.ts

@@ -56,8 +56,9 @@ export const createReadableStreamFromElement: CreateReadableStreamFromElement =
       });
 
       const isbot = checkIsBot(request.headers.get('user-agent'));
-      if (isbot) {
-        // However, when a crawler visits your page, or if you’re generating the pages at the build time,
+      const isSsgRender = request.headers.get('x-modern-ssg-render') === 'true';
+      if (isbot || isSsgRender) {
+        // However, when a crawler visits your page, or if you're generating the pages at the build time,
         // you might want to let all of the content load first and then produce the final HTML output instead of revealing it progressively.
         // from: https://react.dev/reference/react-dom/server/renderToReadableStream#handling-different-errors-in-different-ways
         await readableOriginal.allReady;

packages/runtime/plugin-runtime/src/router/cli/code/index.ts

@@ -28,6 +28,7 @@ import {
 } from '@modern-js/utils';
 import { cloneDeep } from '@modern-js/utils/lodash';
 import { ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME } from '../../../cli/constants';
+import { resolveSSRMode } from '../../../cli/ssr/mode';
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from '../constants';
 import { walk } from './nestedRoutes';
 import * as templates from './templates';
@@ -165,14 +166,15 @@ export const generateCode = async (
           config.server.ssrByEntries,
           packageName,
         );
-        const useSSG = isSSGEntry(config, entryName, entrypoints);
 
-        let mode: SSRMode | undefined;
-        if (ssr) {
-          mode = typeof ssr === 'object' ? ssr.mode || 'string' : 'string';
-        }
+        const ssrMode = resolveSSRMode({
+          entry: entrypoint.entryName,
+          config,
+          appDirectory: appContext.appDirectory,
+          nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+        });
 
-        if (mode === 'stream') {
+        if (ssrMode === 'stream') {
           const hasPageRoute = routes.some(
             route => 'type' in route && route.type === 'page',
           );
@@ -189,7 +191,7 @@ export const generateCode = async (
           code: await templates.fileSystemRoutes({
             metaName,
             routes: routes,
-            ssrMode: useSSG ? 'string' : isUseRsc(config) ? 'stream' : mode,
+            ssrMode: isUseRsc(config) ? 'stream' : ssrMode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
             internalDirectory,
@@ -225,7 +227,7 @@ export const generateCode = async (
           const serverRoutesCode = await templates.fileSystemRoutes({
             metaName,
             routes: filtedRoutesForServer,
-            ssrMode: useSSG ? 'string' : mode,
+            ssrMode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
             internalDirectory,

packages/toolkit/types/common/index.d.ts

@@ -12,4 +12,4 @@ export type ServerPlugin = {
   options?: Record<string, any>;
 };
 
-export type SSRMode = 'string' | 'stream';
+export type SSRMode = 'string' | 'stream' | false;