fix: change hydrateFromRoot root to renderFromRoot

umijs · Apr 1, 2024 · 20c4472 · 20c4472
1 parent 90aebf4
commit 20c4472
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -50,7 +50,7 @@ export async function getClientRootComponent(opts: IRootComponentOptions) {
       {rootContainer}
     </AppContext.Provider>
   );
-  if (!opts.hydrateFromRoot) {
+  if (!opts.renderFromRoot) {
     return <Html {...opts}>{app}</Html>;
   } else {
     return app;

diff --git 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
@@ -40,7 +40,7 @@ interface CreateRequestHandlerOptions extends CreateRequestServerlessOptions {
   helmetContext?: any;
   ServerInsertedHTMLContext: React.Context<ServerInsertedHTMLHook | null>;
   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(
-Original file line number
+Diff line change
@@ Expand Up / @@ -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,
             },
           });
         }
@@ Expand Down @@