diff --git a/examples/ssr-demo/.umirc.ts b/examples/ssr-demo/.umirc.ts index c905a4960ba7..f5a95e511b89 100644 --- a/examples/ssr-demo/.umirc.ts +++ b/examples/ssr-demo/.umirc.ts @@ -9,7 +9,7 @@ export default { scripts: [`https://a.com/b.js`], ssr: { builder: 'webpack', - hydrateFromRoot: false, + renderFromRoot: false, }, styles: [`body { color: red; }`, `https://a.com/b.css`], diff --git a/packages/preset-umi/src/features/ssr/ssr.ts b/packages/preset-umi/src/features/ssr/ssr.ts index ede66b9d22a0..128a9de01944 100644 --- a/packages/preset-umi/src/features/ssr/ssr.ts +++ b/packages/preset-umi/src/features/ssr/ssr.ts @@ -27,7 +27,7 @@ export default (api: IApi) => { serverBuildPath: zod.string(), platform: zod.string(), builder: zod.enum(['esbuild', 'webpack']), - hydrateFromRoot: zod.boolean(), + renderFromRoot: zod.boolean(), }) .deepPartial(); }, diff --git a/packages/preset-umi/src/features/tmpFiles/tmpFiles.ts b/packages/preset-umi/src/features/tmpFiles/tmpFiles.ts index 1863f0b19b8c..4e3543a4fa8c 100644 --- a/packages/preset-umi/src/features/tmpFiles/tmpFiles.ts +++ b/packages/preset-umi/src/features/tmpFiles/tmpFiles.ts @@ -525,7 +525,7 @@ if (process.env.NODE_ENV === 'development') { metas, scripts: scripts || [], }), - hydrateFromRoot: api.config.ssr?.hydrateFromRoot ?? false, + renderFromRoot: api.config.ssr?.renderFromRoot ?? false, }, }); } diff --git a/packages/preset-umi/templates/server.tpl b/packages/preset-umi/templates/server.tpl index 02a2a181f97f..06f409fcd446 100644 --- a/packages/preset-umi/templates/server.tpl +++ b/packages/preset-umi/templates/server.tpl @@ -52,7 +52,7 @@ const createOpts = { createHistory, ServerInsertedHTMLContext, metadata: {{{metadata}}}, - hydrateFromRoot: {{{hydrateFromRoot}}} + renderFromRoot: {{{renderFromRoot}}} }; const requestHandler = createRequestHandler(createOpts); diff --git a/packages/renderer-react/src/browser.tsx b/packages/renderer-react/src/browser.tsx index 3aae23d7bd1c..acfa650df334 100644 --- a/packages/renderer-react/src/browser.tsx +++ b/packages/renderer-react/src/browser.tsx @@ -97,10 +97,10 @@ export type RenderClientOpts = { */ rootElement?: HTMLElement; /** - * ssr 是否从 app root 根节点开始 hydrate - * @doc 默认 false, 从 app root 开始水合，为 true 时从 html 开始 + * ssr 是否从 app root 根节点开始 render + * @doc 默认 false, 从 app root 开始 render，为 true 时从 html 开始 */ - hydrateFromRoot?: boolean; + renderFromRoot?: boolean; /** * 当前的路由配置 */ diff --git a/packages/renderer-react/src/server.tsx b/packages/renderer-react/src/server.tsx index 8a74c8f8ded8..119c752c6a3d 100644 --- a/packages/renderer-react/src/server.tsx +++ b/packages/renderer-react/src/server.tsx @@ -50,7 +50,7 @@ export async function getClientRootComponent(opts: IRootComponentOptions) { {rootContainer} ); - if (!opts.hydrateFromRoot) { + if (!opts.renderFromRoot) { return {app}; } else { return app; diff --git a/packages/renderer-react/src/types.ts b/packages/renderer-react/src/types.ts index 6a9320ec095b..991a4b62ee00 100644 --- a/packages/renderer-react/src/types.ts +++ b/packages/renderer-react/src/types.ts @@ -51,7 +51,7 @@ export interface IRootComponentOptions { loaderData: { [routeKey: string]: any }; manifest: any; metadata?: IMetadata; - hydrateFromRoot: boolean; + renderFromRoot: boolean; } export interface IHtmlProps { diff --git a/packages/server/src/ssr.ts b/packages/server/src/ssr.ts index 80c001fa574f..14ea8d019676 100644 --- a/packages/server/src/ssr.ts +++ b/packages/server/src/ssr.ts @@ -40,7 +40,7 @@ interface CreateRequestHandlerOptions extends CreateRequestServerlessOptions { helmetContext?: any; ServerInsertedHTMLContext: React.Context; metadata: IMetadata; - hydrateFromRoot: boolean; + renderFromRoot: boolean; } interface IExecLoaderOpts { @@ -157,7 +157,7 @@ function createJSXGenerator(opts: CreateRequestHandlerOptions) { manifest, loaderData, metadata: opts.metadata, - hydrateFromRoot: opts.hydrateFromRoot, + renderFromRoot: opts.renderFromRoot, }; const element = (await opts.getClientRootComponent(